Set border thickness for toolbar buttons to 0 by default

benruehl · Nov 22, 2018 · 2d0198c · 2d0198c
1 parent 7f5de6b
commit 2d0198c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/AdonisUI.ClassicTheme/NamedStyles/AccentToolbarButton.xaml b/AdonisUI.ClassicTheme/NamedStyles/AccentToolbarButton.xaml
@@ -14,6 +14,7 @@
         <Setter Property="Foreground" Value="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="adonisExtensions:RippleExtension.BackgroundBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentInteractionBrush}}"/>
         <Setter Property="adonisExtensions:RippleExtension.BorderBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentInteractionBorderBrush}}"/>
         <Setter Property="adonisExtensions:RippleExtension.ForegroundBrush" Value="{DynamicResource {x:Static adonisUi:Brushes.AccentInteractionForegroundBrush}}"/>

diff --git a/AdonisUI.ClassicTheme/NamedStyles/ToolbarButton.xaml b/AdonisUI.ClassicTheme/NamedStyles/ToolbarButton.xaml
@@ -10,7 +10,7 @@
     <Style x:Key="{x:Static adonisUi:Styles.ToolbarButton}" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="{DynamicResource {x:Static adonisUi:Dimensions.BorderThickness}}"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Padding" Value="2"/>
 
         <Style.Triggers>

diff --git a/AdonisUI.Demo/MainWindow.xaml b/AdonisUI.Demo/MainWindow.xaml
@@ -85,14 +85,12 @@
 
                             <Button Content="Change Theme"
                                     Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}"
-                                    BorderThickness="0"
                                     Click="ChangeTheme"
                                     HorizontalAlignment="Stretch"
                                     Padding="8"/>
 
                             <Button Content="Check Issues"
                                     Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}"
-                                    BorderThickness="0"
                                     Click="OpenIssueDialog"
                                     HorizontalAlignment="Stretch"
                                     Padding="8"/>