fix presentation

sandre58 · Sep 11, 2024 · 0be393b · 0be393b
1 parent 4db3024
commit 0be393b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/MyNet.Wpf.Presentation/Views/List/PaginationView.xaml b/src/MyNet.Wpf.Presentation/Views/List/PaginationView.xaml
@@ -24,7 +24,7 @@
     </UserControl.Resources>
 
     <DockPanel>
-        <my:DropDownButton Style="{StaticResource MyNet.Styles.DropDownButton.Elevation.Alternate}" Margin="{StaticResource MyNet.Margins.Medium.Left}"
+        <my:DropDownButton Style="{StaticResource MyNet.Styles.DropDownButton.Filled}" Margin="{StaticResource MyNet.Margins.Medium.Left}"
                            VerticalAlignment="Stretch"
                            DockPanel.Dock="Right"
                            PopupPadding="0"

diff --git a/src/MyNet.Wpf.Presentation/Views/Rules/EditableRulesView.xaml b/src/MyNet.Wpf.Presentation/Views/Rules/EditableRulesView.xaml
@@ -16,7 +16,7 @@
     </UserControl.Resources>
 
     <DockPanel>
-        <my:DropDownButton Style="{StaticResource MyNet.Styles.DropDownButton.Elevation.Alternate}"
+        <my:DropDownButton Style="{StaticResource MyNet.Styles.DropDownButton.Filled}"
                            Margin="{StaticResource MyNet.Margins.Medium.Bottom}"
                            HorizontalAlignment="Stretch"
                            HorizontalContentAlignment="Stretch"

diff --git a/src/MyNet.Wpf/Styles/Controls.ToolBar.xaml b/src/MyNet.Wpf/Styles/Controls.ToolBar.xaml
@@ -215,6 +215,7 @@
         <Setter Property="p:ThemeAssist.IsCheckedBorderBrush" Value="{me:BrushBinding SelfPath=Background}" />
         <Setter Property="p:ThemeAssist.IsMouseOverForeground" Value="{me:BrushBinding SelfPath=Background, Contrast=True}" />
         <Setter Property="Background" Value="{DynamicResource MyNet.Brushes.Primary}" />
+        <Setter Property="BorderBrush" Value="{me:BrushBinding SelfPath=Background}" />
         <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
         <Setter Property="p:ThemeAssist.IsCheckedForeground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
     </Style>
@@ -237,6 +238,7 @@
         <Setter Property="p:ThemeAssist.IsCheckedBorderBrush" Value="{me:BrushBinding SelfPath=Background}" />
         <Setter Property="p:ThemeAssist.IsMouseOverForeground" Value="{me:BrushBinding SelfPath=Background, Contrast=True}" />
         <Setter Property="Background" Value="{DynamicResource MyNet.Brushes.Primary}" />
+        <Setter Property="BorderBrush" Value="{me:BrushBinding SelfPath=Background}" />
         <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
         <Setter Property="p:ThemeAssist.IsCheckedForeground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
     </Style>
@@ -275,6 +277,7 @@
         <Setter Property="p:ThemeAssist.IsMouseOverBackground" Value="{me:BrushBinding SelfPath=Background, Opacity={StaticResource MyNet.Opacity.Hovered}}" />
         <Setter Property="p:ThemeAssist.IsMouseOverForeground" Value="{me:BrushBinding SelfPath=Background, Contrast=True}" />
         <Setter Property="Background" Value="{DynamicResource MyNet.Brushes.Primary}" />
+        <Setter Property="BorderBrush" Value="{me:BrushBinding SelfPath=Background}" />
         <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
         <Setter Property="p:ThemeAssist.IsCheckedForeground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
     </Style>
@@ -297,6 +300,7 @@
         <Setter Property="p:ThemeAssist.IsCheckedBorderBrush" Value="{me:BrushBinding SelfPath=Background}" />
         <Setter Property="p:ThemeAssist.IsMouseOverForeground" Value="{me:BrushBinding SelfPath=Background, Contrast=True}" />
         <Setter Property="Background" Value="{DynamicResource MyNet.Brushes.Primary}" />
+        <Setter Property="BorderBrush" Value="{me:BrushBinding SelfPath=Background}" />
         <Setter Property="Foreground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
         <Setter Property="p:ThemeAssist.IsCheckedForeground" Value="{DynamicResource MyNet.Brushes.Primary.Foreground}" />
     </Style>