Skip to content

Commit d45b66a

Browse files
Merge branch 'syncfusion:main' into main
2 parents 714ba39 + 3c33c23 commit d45b66a

File tree

5 files changed

+25
-3
lines changed

5 files changed

+25
-3
lines changed

maui/src/Core/AppHostBuilder.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ public static MauiAppBuilder ConfigureSyncfusionToolkit(this MauiAppBuilder buil
3737
#endif
3838
});
3939

40+
builder.ConfigureFonts(fonts =>
41+
{
42+
fonts.AddFont("MauiMaterialAssets.ttf", "MauiMaterialAssets");
43+
});
44+
4045
#if WINDOWS
4146
builder.Services.TryAddEnumerable(ServiceDescriptor.Transient<IMauiInitializeService, MauiControlsInitializer>());
4247
#endif

maui/src/Core/Extensions/CanvasExtensions.Windows.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ public static void DrawText(this ICanvas canvas, string value, Rect rect, Horizo
129129

130130
format.HorizontalAlignment = canvasHorizontalAlignment;
131131
format.Options = CanvasDrawTextOptions.Clip;
132-
w2DCanvas.Session.DrawText(value, new Windows.Foundation.Rect(rect.X, rect.Y, rect.Width, rect.Height), textElement.TextColor.AsColor(), format);
132+
if(rect.Width >= 0 && rect.Height >= 0)
133+
{
134+
w2DCanvas.Session.DrawText(value, new Windows.Foundation.Rect(rect.X, rect.Y, rect.Width, rect.Height), textElement.TextColor.AsColor(), format);
135+
}
133136
}
134137
}
135138
}

maui/src/Syncfusion.Maui.Toolkit.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@
106106
</ItemGroup>
107107

108108
<ItemGroup>
109-
<MauiFont Include="Resources\Fonts\MauiMaterialAssets.ttf" />
109+
<MauiFont Include="Resources\Fonts\MauiMaterialAssets.ttf" >
110+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
111+
</MauiFont>
110112
</ItemGroup>
111113

112114
<ItemGroup>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<ItemGroup>
4+
<!-- Set the correct build action for font files -->
5+
<MauiFont Include="$(MSBuildThisFileDirectory)..\buildTransitive\Resources\Fonts\MauiMaterialAssets.ttf">
6+
<Link>Resources\Fonts\MauiMaterialAssets.ttf</Link>
7+
</MauiFont>
8+
</ItemGroup>
9+
</Project>

maui/src/TextInputLayout/SfTextInputLayout.Methods.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1943,7 +1943,10 @@ void DrawOutlinedBorder(ICanvas canvas)
19431943
if (((IsLayoutFocused && !string.IsNullOrEmpty(Hint)) || IsHintFloated) && ShowHint)
19441944
{
19451945
CalculateClipRect();
1946-
canvas.SubtractFromClip(_clipRect);
1946+
if(_clipRect.Width >= 0 && _clipRect.Height >= 0)
1947+
{
1948+
canvas.SubtractFromClip(_clipRect);
1949+
}
19471950
}
19481951

19491952
SetOutlinedContainerBackground(canvas);

0 commit comments

Comments
 (0)