Skip to content

Commit 394b198

Browse files
aruljenithberkmansaruljenithberkmans
committed
2 parents f351f4d + d45b66a commit 394b198

File tree

8 files changed

+41
-6
lines changed

8 files changed

+41
-6
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ See the [Development Guide](./.github/DEVELOPMENT.md) for more details about thi
250250
</a>
251251

252252
## About Syncfusion®
253-
Founded in 2001 and headquartered in Research Triangle Park, N.C., Syncfusion® has more than 29,000 customers and more than 1 million users, including large financial institutions, Fortune 500 companies, and global IT consultancies.
253+
Founded in 2001 and headquartered in Research Triangle Park, N.C., Syncfusion® has more than 35,000 customers and more than 1 million users, including large financial institutions, Fortune 500 companies, and global IT consultancies.
254254

255255
Today, we provide 1800+ components and frameworks for web ([Blazor](https://www.syncfusion.com/blazor-components?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [ASP.NET Core](https://www.syncfusion.com/aspnet-core-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [ASP.NET MVC](https://www.syncfusion.com/aspnet-mvc-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [JavaScript](https://www.syncfusion.com/javascript-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [Angular](https://www.syncfusion.com/angular-ui-components?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [React](https://www.syncfusion.com/react-ui-components?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [Vue](https://www.syncfusion.com/vue-ui-components?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), and [Flutter](https://www.syncfusion.com/flutter-widgets?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget)), mobile ([.NET MAUI](https://www.syncfusion.com/maui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [Xamarin](https://www.syncfusion.com/xamarin-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [Flutter](https://www.syncfusion.com/flutter-widgets?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [UWP](https://www.syncfusion.com/uwp-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), and [JavaScript](https://www.syncfusion.com/javascript-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget)), and desktop development ([WinForms](https://www.syncfusion.com/winforms-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [WPF](https://www.syncfusion.com/wpf-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [WinUI](https://www.syncfusion.com/winui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget), [Flutter](https://www.syncfusion.com/flutter-widgets?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget) and [UWP](https://www.syncfusion.com/uwp-ui-controls?utm_source=nuget&utm_medium=listing&utm_campaign=maui-toolkit-nuget)).
256256
___

‎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/NumericEntry/SfNumericEntry.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,13 @@ protected override void OnPropertyChanged([CallerMemberName] string? propertyNam
457457
}
458458
break;
459459

460+
case nameof(IsVisible):
461+
if (_textBox != null)
462+
{
463+
_textBox.IsVisible = IsVisible;
464+
}
465+
break;
466+
460467
#if WINDOWS
461468
case nameof(FlowDirection):
462469
SetFlowDirection();

‎maui/src/Popup/SfPopup/SfPopup.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,8 +2261,6 @@ void ApplyOverlayBackground()
22612261
{
22622262
_popupOverlayContainer.ApplyBackgroundColor(Colors.Transparent);
22632263
}
2264-
2265-
_popupOverlayContainer.IsVisible = true;
22662264
}
22672265
}
22682266

@@ -3156,6 +3154,14 @@ void SetParent()
31563154
if (_popupOverlayContainer.Parent is null || _popupView.Parent is null)
31573155
{
31583156
_popupOverlayContainer.Parent = page;
3157+
3158+
// _popupOverlayContainer visibility is set to false after dismissing the popup.
3159+
// _popupOverlayContainer will be set as the parent to popupView here from DisplayPopup().
3160+
// Due to Maui 9.0.50 changes [https://github.com/dotnet/maui/pull/20154],
3161+
// the IsVisible property of _popupView is set to false when reopening with the same instance of the popup, since _popupOverlayContainer visibility will now be false.
3162+
// _popupOverlayContainer visibility is set to true in a later section, but _popupView visibility will still remain false.
3163+
// causes popup to appear blank for second time.
3164+
_popupOverlayContainer.IsVisible = true;
31593165
_popupView.Parent = _popupOverlayContainer;
31603166
}
31613167
}

‎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>

‎maui/src/Syncfusion.Maui.Toolkit.props

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)