Merge branch 'master' into dev/doti/missing-svg-fix

unoplatform · Nov 1, 2023 · 1dcb511 · 1dcb511
2 parents ac5749d + fb68cdb
commit 1dcb511
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/NumberBoxSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/NumberBoxSamplePage.xaml
@@ -24,11 +24,15 @@
 
 						<smtx:XamlDisplay UniqueKey="NumberBoxSamplePage_Fluent_Default"
 										  smtx:XamlDisplayExtensions.Header="A simple NumberBox">
-							<muxc:NumberBox Header="Enter a number:"
-											Minimum="10"
-											Maximum="100"
-											PlaceholderText="10"
-											Description="This is a description which is shown below the NumberBox"/>
+							<StackPanel>
+								<muxc:NumberBox Header="Enter a number:"
+												Minimum="10"
+												Maximum="100"
+												PlaceholderText="10" />
+								<TextBlock Text="This is a description which is shown below the NumberBox"
+										   TextWrapping="WrapWholeWords"
+										   Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />
+							</StackPanel>
 						</smtx:XamlDisplay>
 
 						<smtx:XamlDisplay UniqueKey="NumberBoxSamplePage_Fluent_Expressions"

diff --git a/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj b/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
@@ -34,8 +34,8 @@
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.2366" />
 		<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
-		<PackageReference Include="SkiaSharp.Skottie" Version="2.88.5" />
-		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.5" />
+		<PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
+		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
 		<PackageReference Include="Uno.WinUI.Svg" Version="5.0.0-dev.2366" />
 		<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
 		<PackageReference Include="Uno.WinUI.MediaPlayer.Skia.Gtk" Version="5.0.0-dev.2366" />