chore: Undo Uno specific adjustments to re-enable gradient borders

unoplatform · Sep 9, 2021 · 5f11b30 · 5f11b30
1 parent ce63c51
commit 5f11b30
Show file tree

Hide file tree

Showing 4 changed files with 1,131 additions and 1,623 deletions.
diff --git a/src/Uno.UI.FluentTheme/Resources/Version2/Priority01/Common_themeresources_any.xaml b/src/Uno.UI.FluentTheme/Resources/Version2/Priority01/Common_themeresources_any.xaml
@@ -224,13 +224,8 @@
             <SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="#FF00FF" />
 
             <!-- Elevation border brushes-->
-            <!-- TODO Uno: LinearGradientBrush as border is not supported well -->
 
-            <SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-
-            <!-- <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+            <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
                 <LinearGradientBrush.GradientStops>
                     <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
@@ -252,7 +247,7 @@
                     <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush> -->
+            </LinearGradientBrush>
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="Light">
@@ -465,13 +460,7 @@
             <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
 
             <!-- Elevation border brushes-->
-
-            <!-- TODO Uno: LinearGradientBrush as border is not supported well -->
-            <SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-
-            <!-- 
+
             <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
@@ -497,7 +486,7 @@
                     <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush> -->
+            </LinearGradientBrush>
 
             <!-- Duplication from HighContrast colors to match keys, set to magenta to show these should not be used  -->
             <SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="#FF00FF" />

diff --git a/src/Uno.UI.FluentTheme/Resources/Version2/Priority02/TextBox_themeresources.xaml b/src/Uno.UI.FluentTheme/Resources/Version2/Priority02/TextBox_themeresources.xaml
@@ -56,10 +56,7 @@
             <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
 
-            <!-- TODO Uno: Cannot use LinearGradientBrush for border -->
-            <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="#50FFFFFF" />
-            <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorLight2}" />
-            <!-- <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
                 </LinearGradientBrush.RelativeTransform>
@@ -77,7 +74,7 @@
                     <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorLight2}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush> -->
+            </LinearGradientBrush>
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="HighContrast">
@@ -109,10 +106,7 @@
             <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
             <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
 
-            <!-- TODO Uno: Cannot use LinearGradientBrush for border -->
-            <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorDefault}" />
-            <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorLight2}" />
-            <!--<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
                 </LinearGradientBrush.RelativeTransform>
@@ -130,7 +124,7 @@
                     <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorLight2}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush>-->
+            </LinearGradientBrush>
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="Light">
@@ -182,10 +176,7 @@
             <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
 
-            <!-- TODO Uno: Cannot use LinearGradientBrush for border -->
-            <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="#50000000" />
-            <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorDark1}" />
-            <!--<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
                 </LinearGradientBrush.RelativeTransform>
@@ -203,7 +194,7 @@
                     <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorDark1}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush>-->
+            </LinearGradientBrush>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>