chore: adjust shadow corner impl

unoplatform · Aug 29, 2023 · 1cd6cd7 · 1cd6cd7
1 parent a8e6843
commit 1cd6cd7
Show file tree

Hide file tree

Showing 7 changed files with 298 additions and 200 deletions.
diff --git a/....Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml b/....Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
@@ -232,7 +232,6 @@
 									</utu:ShadowContainer>
 
 									<utu:ShadowContainer Margin="0,60,0,0"
-														 CornerRadius="20"
 														 Background="{StaticResource UnoColor}"
 														 Shadows="{StaticResource NeumorphismHollow}">
 										<TextBox Width="200"
@@ -244,8 +243,7 @@
 												 PlaceholderText="Hollow element"
 												 Text="Login" />
 									</utu:ShadowContainer>
-									<utu:ShadowContainer CornerRadius="20"
-														 Background="{StaticResource UnoColor}"
+									<utu:ShadowContainer Background="{StaticResource UnoColor}"
 														 Shadows="{StaticResource NeumorphismHollow}"
 														 Margin="0,15">
 										<TextBox Width="200"
@@ -259,7 +257,6 @@
 									</utu:ShadowContainer>
 
 									<utu:ShadowContainer Margin="0,30"
-														 CornerRadius="15"
 														 Background="{StaticResource UnoColor}"
 														 Shadows="{StaticResource NeumorphismBulging}">
 										<Button Width="200"
@@ -277,19 +274,15 @@
 												Orientation="Horizontal"
 												Spacing="16">
 
-										<utu:ShadowContainer Background="{StaticResource UnoColor}"
-															 CornerRadius="20"
-															 Shadows="{StaticResource NeumorphismRaising}">
+										<utu:ShadowContainer Background="{StaticResource UnoColor}" Shadows="{StaticResource NeumorphismRaising}">
 											<Button Content="Regular"
 													CornerRadius="20"
 													BorderThickness="0"
 													Background="Transparent"
 													Foreground="White" />
 										</utu:ShadowContainer>
 
-										<utu:ShadowContainer CornerRadius="50"
-															 Background="{StaticResource UnoColor}"
-															 Shadows="{StaticResource NeumorphismRaising}">
+										<utu:ShadowContainer Background="{StaticResource UnoColor}" Shadows="{StaticResource NeumorphismRaising}">
 											<Button Content="Round"
 													Width="100"
 													Height="100"
@@ -299,9 +292,7 @@
 													Foreground="White" />
 										</utu:ShadowContainer>
 
-										<utu:ShadowContainer Background="{StaticResource UnoColor}"
-															 CornerRadius="20"
-															 Shadows="{StaticResource NeumorphismRaising}">
+										<utu:ShadowContainer Background="{StaticResource UnoColor}" Shadows="{StaticResource NeumorphismRaising}">
 											<Button Content="Bigger"
 													Height="60"
 													BorderThickness="0"

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Controls/SamplePageLayout.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Controls/SamplePageLayout.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Text;
 using Uno.Disposables;
-using Uno.Extensions;
 using Uno.Toolkit.UI;
 using Uno.Toolkit.Samples.Entities;
 using Uno.Toolkit.Samples.Helpers;