fix: Adopt styles to changes in Avalonia 0.10.12

AvaloniaUI · Feb 9, 2022 · 3a15ed6 · 3a15ed6
1 parent 0c5b86a
commit 3a15ed6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/Citrus.Avalonia.Sandbox/MainWindow.xaml b/src/Citrus.Avalonia.Sandbox/MainWindow.xaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Background="{DynamicResource ThemeBackgroundColor}"
         x:Class="Citrus.Avalonia.Sandbox.MainWindow"
-        Width="920" Height="630">
+        Width="950" Height="630">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>

diff --git a/src/Citrus.Avalonia/Theme/ButtonStyles.xaml b/src/Citrus.Avalonia/Theme/ButtonStyles.xaml
@@ -6,33 +6,33 @@
         <Setter Property="Margin" Value="0 5" />
         <Setter Property="Background" Value="{DynamicResource HighlightBrush}" />
     </Style>
-    <Style Selector="Button > TextBlock">
+    <Style Selector="Button">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
 
-    <Style Selector="Button /template/ ContentPresenter">
+    <Style Selector="Button">
         <Setter Property="CornerRadius" Value="5" />
     </Style>
     <Style Selector="Button:pointerover">
         <Setter Property="Background" Value="{DynamicResource HighlightHoverBrush}" />
     </Style>
-    <Style Selector="Button:pressed /template/ ContentPresenter">
+    <Style Selector="Button:pressed">
         <Setter Property="Background" Value="{DynamicResource HighlightBrush}" />
     </Style>
 
     <Style Selector="Button.Primary">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}" />
     </Style>
-    <Style Selector="Button.Primary > TextBlock">
+    <Style Selector="Button.Primary">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
-    <Style Selector="Button.Primary /template/ ContentPresenter">
+    <Style Selector="Button.Primary">
         <Setter Property="CornerRadius" Value="5" />
     </Style>
     <Style Selector="Button.Primary:pointerover">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
     </Style>
-    <Style Selector="Button.Primary:pressed /template/ ContentPresenter">
+    <Style Selector="Button.Primary:pressed">
         <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}" />
     </Style>
 </Styles>
diff --git a/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml b/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml
@@ -8,7 +8,7 @@
         <Setter Property="Padding" Value="10" />
         <Setter Property="Margin" Value="0 5" />
     </Style>
-    <Style Selector="TextBox /template/ Border">
+    <Style Selector="TextBox">
         <Setter Property="CornerRadius" Value="5" />
     </Style>
     <Style Selector="TextBox:pointerover /template/ Border">

diff --git a/src/Citrus.Avalonia/Theme/ToggleButtonStyles.xaml b/src/Citrus.Avalonia/Theme/ToggleButtonStyles.xaml
@@ -6,13 +6,13 @@
         <Setter Property="Background" Value="{DynamicResource ThemeBorderHighBrush}" />
     </Style>
 
-    <Style Selector="ToggleButton > TextBlock">
+    <Style Selector="ToggleButton">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
-    <Style Selector="ToggleButton /template/ ContentPresenter">
+    <Style Selector="ToggleButton">
         <Setter Property="CornerRadius" Value="5" />
     </Style>
-    <Style Selector="ToggleButton:pointerover">
+    <Style Selector="ToggleButton:pointerover /template/ ContentPresenter">
         <Setter Property="Background" Value="{DynamicResource ThemeBorderHighBrush}" />
     </Style>
     <Style Selector="ToggleButton:pressed /template/ ContentPresenter">
@@ -25,13 +25,13 @@
     <Style Selector="ToggleButton.Primary">
         <Setter Property="Background" Value="{DynamicResource ThemeBorderHighBrush}" />
     </Style>
-    <Style Selector="ToggleButton.Primary > TextBlock">
+    <Style Selector="ToggleButton.Primary">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
-    <Style Selector="ToggleButton.Primary /template/ ContentPresenter">
+    <Style Selector="ToggleButton.Primary">
         <Setter Property="CornerRadius" Value="5" />
     </Style>
-    <Style Selector="ToggleButton.Primary:pointerover">
+    <Style Selector="ToggleButton.Primary:pointerover /template/ ContentPresenter">
         <Setter Property="Background" Value="{DynamicResource ThemeBorderHighBrush}" />
     </Style>
     <Style Selector="ToggleButton.Primary:pressed /template/ ContentPresenter">