lsm/CPF
1
0
Fork 0
mirror of https://gitee.com/csharpui/CPF.git synced 2025-12-19 19:47:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

增加ResponsivePanel 调整绘图API

Browse Source
This commit is contained in:
小红帽
2023-12-19 22:11:21 +08:00
parent fb9b04e7a0
commit 906c865964
97 changed files with 1327 additions and 16705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
CPF.Skia/SkiaDrawingContext.cs
View File

@@ -440,7 +440,7 @@ namespace CPF.Skia
InitializeBrush(strokeBrush);
paintWrapper = CreatePaint(strokeBrush, stroke, font);
}
var drawline = decoration.Stroke.Width > 0 && decoration.Brush != null;
var drawline = decoration.Stroke.Width > 0 && decoration.Brush != null && decoration.Location != TextDecorationLocation.None;
List<LinePosition> linePositions = null;
if (drawline)
{
@@ -460,13 +460,16 @@ namespace CPF.Skia
if (textAlignment != TextAlignment.Left && maxWidth != float.MaxValue || drawline)
{
w = paint.Paint.MeasureString(text);
if (textAlignment == TextAlignment.Right)
if (textAlignment != TextAlignment.Left && maxWidth != float.MaxValue)
{
x = x + (maxWidth - w);
}
else if (textAlignment == TextAlignment.Center)
{
x = x + (maxWidth - w) / 2;
if (textAlignment == TextAlignment.Right)
{
x = x + (maxWidth - w);
}
else if (textAlignment == TextAlignment.Center)
{
x = x + (maxWidth - w) / 2;
}
}
}
if (strokeBrush != null && stroke.Width > 0)
@@ -490,17 +493,17 @@ namespace CPF.Skia
{
w += 2;
}
switch (decoration.Location)
if (decoration.Location.HasFlag(TextDecorationLocation.Underline))
{
case TextDecorationLocation.Underline:
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing, Width = w });
break;
case TextDecorationLocation.OverLine:
linePositions.Add(new LinePosition { X = x, Y = location.Y, Width = w });
break;
case TextDecorationLocation.Strikethrough:
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing / 2, Width = w });
break;
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing, Width = w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.OverLine))
{
linePositions.Add(new LinePosition { X = x, Y = location.Y, Width = w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.Strikethrough))
{
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing / 2, Width = w });
}
}
}
@@ -616,17 +619,17 @@ namespace CPF.Skia
}
if (drawline)
{
switch (decoration.Location)
if (decoration.Location.HasFlag(TextDecorationLocation.Underline))
{
case TextDecorationLocation.Underline:
linePositions.Add(new LinePosition { X = xx, Y = item.y + paint.Paint.FontSpacing + paint.Paint.FontMetrics.Ascent, Width = item.w });
break;
case TextDecorationLocation.OverLine:
linePositions.Add(new LinePosition { X = xx, Y = item.y + paint.Paint.FontMetrics.Ascent, Width = item.w });
break;
case TextDecorationLocation.Strikethrough:
linePositions.Add(new LinePosition { X = xx, Y = item.y + paint.Paint.FontSpacing / 2 + paint.Paint.FontMetrics.Ascent, Width = item.w });
break;
linePositions.Add(new LinePosition { X = xx, Y = item.y + paint.Paint.FontSpacing + paint.Paint.FontMetrics.Ascent, Width = item.w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.OverLine))
{
linePositions.Add(new LinePosition { X = xx, Y = item.y + paint.Paint.FontMetrics.Ascent, Width = item.w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.Strikethrough))
{
linePositions.Add(new LinePosition { X = xx, Y = item.y + paint.Paint.FontSpacing / 2 + paint.Paint.FontMetrics.Ascent, Width = item.w });
}
}
}
@@ -636,10 +639,10 @@ namespace CPF.Skia
paintWrapper?.Dispose();
if (drawline)
{
using (var brush = decoration.Brush)
//using (var brush = decoration.Brush)
{
InitializeBrush(brush);
using (var paint = CreatePaint(brush, decoration.Stroke))
InitializeBrush(decoration.Brush);
using (var paint = CreatePaint(decoration.Brush, decoration.Stroke))
{
foreach (var item in linePositions)
{
@@ -662,7 +665,7 @@ namespace CPF.Skia
InitializeBrush(strokeBrush);
paintWrapper = CreatePaint(strokeBrush, stroke, font);
}
var drawline = decoration.Stroke.Width > 0 && decoration.Brush != null;
var drawline = decoration.Stroke.Width > 0 && decoration.Brush != null && decoration.Location != TextDecorationLocation.None;
List<LinePosition> linePositions = null;
if (drawline)
{
@@ -680,13 +683,16 @@ namespace CPF.Skia
if (textAlignment != TextAlignment.Left && maxWidth != float.MaxValue || drawline)
{
w = paint.Paint.MeasureString(text);
if (textAlignment == TextAlignment.Right)
if (textAlignment != TextAlignment.Left && maxWidth != float.MaxValue)
{
x = x + (maxWidth - w);
}
else if (textAlignment == TextAlignment.Center)
{
x = x + (maxWidth - w) / 2;
if (textAlignment == TextAlignment.Right)
{
x = x + (maxWidth - w);
}
else if (textAlignment == TextAlignment.Center)
{
x = x + (maxWidth - w) / 2;
}
}
}
if (strokeBrush != null && stroke.Width > 0)
@@ -705,17 +711,17 @@ namespace CPF.Skia
{
w += 2;
}
switch (decoration.Location)
if (decoration.Location.HasFlag(TextDecorationLocation.Underline))
{
case TextDecorationLocation.Underline:
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing, Width = w });
break;
case TextDecorationLocation.OverLine:
linePositions.Add(new LinePosition { X = x, Y = location.Y, Width = w });
break;
case TextDecorationLocation.Strikethrough:
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing / 2, Width = w });
break;
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing, Width = w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.OverLine))
{
linePositions.Add(new LinePosition { X = x, Y = location.Y, Width = w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.Strikethrough))
{
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing / 2, Width = w });
}
}
}
@@ -764,13 +770,16 @@ namespace CPF.Skia
if (textAlignment != TextAlignment.Left && maxWidth != float.MaxValue || drawline)
{
w = paint.Paint.MeasureString(newText);
if (textAlignment == TextAlignment.Right)
if (textAlignment != TextAlignment.Left && maxWidth != float.MaxValue)
{
x = x + (maxWidth - w);
}
else if (textAlignment == TextAlignment.Center)
{
x = x + (maxWidth - w) / 2;
if (textAlignment == TextAlignment.Right)
{
x = x + (maxWidth - w);
}
else if (textAlignment == TextAlignment.Center)
{
x = x + (maxWidth - w) / 2;
}
}
}
if (strokeBrush != null && stroke.Width > 0)
@@ -789,17 +798,17 @@ namespace CPF.Skia
{
w += 2;
}
switch (decoration.Location)
if (decoration.Location.HasFlag(TextDecorationLocation.Underline))
{
case TextDecorationLocation.Underline:
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing, Width = w });
break;
case TextDecorationLocation.OverLine:
linePositions.Add(new LinePosition { X = x, Y = location.Y, Width = w });
break;
case TextDecorationLocation.Strikethrough:
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing / 2, Width = w });
break;
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing, Width = w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.OverLine))
{
linePositions.Add(new LinePosition { X = x, Y = location.Y, Width = w });
}
if (decoration.Location.HasFlag(TextDecorationLocation.Strikethrough))
{
linePositions.Add(new LinePosition { X = x, Y = location.Y + paint.Paint.FontSpacing / 2, Width = w });
}
}
}
@@ -807,10 +816,10 @@ namespace CPF.Skia
paintWrapper?.Dispose();
if (drawline)
{
using (var brush = decoration.Brush)
//using (var brush = decoration.Brush)
{
InitializeBrush(brush);
using (var paint = CreatePaint(brush, decoration.Stroke))
InitializeBrush(decoration.Brush);
using (var paint = CreatePaint(decoration.Brush, decoration.Stroke))
{
foreach (var item in linePositions)
{