Fixed icon alignment in DropDownButton, ToggleButton, Button (compare…

…d to SplitButton)
fluentribbon · Mar 29, 2016 · 2c539f1 · 2c539f1
1 parent 89dc8d9
commit 2c539f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
@@ -56,7 +56,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,2,0" />
+                        Value="2,0,2,0" />
                 <Setter Property="Content"
                         TargetName="iconImage"
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
@@ -92,7 +92,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,2,0" />
+                        Value="2,0,2,0" />
                 <Setter Property="Content"
                         TargetName="iconImage"
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
@@ -214,7 +214,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,0,0" />
+                        Value="2,0,0,0" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
                         Value="-2,0,2,1" />
@@ -256,7 +256,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,2,0" />
+                        Value="2,0,2,0" />
                 <Setter Property="VerticalAlignment"
                         TargetName="controlLabel"
                         Value="Center" />

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
@@ -28,13 +28,17 @@
                      Value="Middle">
                 <Setter Property="Height"
                         Value="22" />
+                <Setter Property="HorizontalAlignment"
+                        Value="Left" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Small">
                 <Setter Property="Height"
                         Value="22" />
                 <Setter Property="Width"
                         Value="22" />
+                <Setter Property="HorizontalAlignment"
+                        Value="Left" />
             </Trigger>
         </Style.Triggers>
     </Style>