Fixes fluentribbon#202 by aligning styles for Button, DropDownButton …

…and SplitButton
mingyaaaa · Nov 19, 2015 · 96ed26b · 96ed26b
1 parent 23e574c
commit 96ed26b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 30 deletions.
diff --git a/Fluent/Themes/Generic/Controls/TwoLineLabel.xaml b/Fluent/Themes/Generic/Controls/TwoLineLabel.xaml
@@ -18,7 +18,6 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center" />
             <StackPanel x:Name="stackPanel1"
-                        Margin="0,-2,0,0"
                         Orientation="Horizontal"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center">
@@ -65,7 +64,7 @@
                         Value="Center" />
                 <Setter Property="Margin"
                         TargetName="stackPanel1"
-                        Value="3,-2,0,0" />
+                        Value="3,0,0,0" />
                 <Setter Property="VerticalAlignment"
                         TargetName="stackPanel1"
                         Value="Center" />

diff --git a/Fluent/Themes/Office2013/Controls/Button.xaml b/Fluent/Themes/Office2013/Controls/Button.xaml
@@ -31,7 +31,7 @@
                                          Style="{DynamicResource TwoLineLabelStyle}"
                                          HorizontalAlignment="Stretch"
                                          VerticalAlignment="Center"
-                                         Margin="2,-1,2,0" />
+                                         Margin="2,0,2,0" />
                 </StackPanel>
             </Grid>
         </Border>
@@ -61,7 +61,7 @@
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,0" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
@@ -79,7 +79,7 @@
                         Value="False" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,0" />
                 <Setter Property="VerticalAlignment"
                         TargetName="border"
                         Value="Stretch" />
@@ -141,6 +141,7 @@
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+
     <Style x:Key="RibbonButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="Template"

diff --git a/Fluent/Themes/Office2013/Controls/DropDownButton.xaml b/Fluent/Themes/Office2013/Controls/DropDownButton.xaml
@@ -5,10 +5,6 @@
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     mc:Ignorable="d">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Fluent;component\Themes\Office2010\Controls\MenuSeparator.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
     <Style x:Key="RibbonDropDownButtonStyle"
            TargetType="{x:Type Fluent:DropDownButton}">
         <Setter Property="Template"
@@ -37,7 +33,7 @@
                 <Setter Property="Height"
                         Value="22" />
                 <Setter Property="Width"
-                        Value="31" />
+                        Value="32" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -74,7 +70,7 @@
                                              Style="{DynamicResource TwoLineLabelStyle}"
                                              HorizontalAlignment="Center"
                                              VerticalAlignment="Center"
-                                             Margin="2,-1,2,2"
+                                             Margin="2,0,2,2"
                                              HasGlyph="{TemplateBinding HasTriangle}" />
                     </StackPanel>
                 </Grid>
@@ -221,7 +217,7 @@
                         Value="1,0,0,0" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="-2,-1,2,1" />
+                        Value="-2,0,2,1" />
                 <Setter Property="Width"
                         TargetName="controlLabel"
                         Value="10" />
@@ -248,7 +244,7 @@
                         Value="False" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,1" />
                 <Setter Property="VerticalAlignment"
                         TargetName="PART_ButtonBorder"
                         Value="Stretch" />

diff --git a/Fluent/Themes/Office2013/Controls/SplitButton.xaml b/Fluent/Themes/Office2013/Controls/SplitButton.xaml
@@ -15,7 +15,7 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="SnapsToDevicePixels"
-                Value="True" />
+                Value="False" />
         <Setter Property="HorizontalAlignment"
                 Value="Left" />
         <Style.Triggers>
@@ -34,7 +34,7 @@
                 <Setter Property="Height"
                         Value="22" />
                 <Setter Property="Width"
-                        Value="34" />
+                        Value="32" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -49,7 +49,8 @@
             <Border BorderThickness="1"
                     Name="PART_ButtonBorder"
                     BorderBrush="{DynamicResource TransparentBrush}"
-                    Background="{DynamicResource TransparentBrush}">
+                    Background="{DynamicResource TransparentBrush}"
+                    VerticalAlignment="Stretch">
                 <StackPanel Orientation="Vertical"
                             Name="stackPanel">
                     <Fluent:ToggleButton x:Name="PART_Button"
@@ -68,7 +69,7 @@
                                          IsChecked="{Binding IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                          IsDefinitive="{TemplateBinding IsDefinitive}"
                                          CanAddToQuickAccessToolBar="{TemplateBinding CanAddButtonToQuickAccessToolBar}" />
-                    <Border BorderThickness="0,1,0,0"
+                    <Border BorderThickness="0,0,0,0"
                             Name="downBorder"
                             BorderBrush="{DynamicResource TransparentBrush}"
                             Background="{DynamicResource TransparentBrush}"
@@ -79,11 +80,8 @@
                                                  Style="{DynamicResource TwoLineLabelStyle}"
                                                  HorizontalAlignment="Center"
                                                  VerticalAlignment="Center"
-                                                 Margin="2,0,2,2"
+                                                 Margin="2,1,2,2"
                                                  HasGlyph="{TemplateBinding HasTriangle}" />
-                            <!--<ContentPresenter x:Name="iconImage" HorizontalAlignment="Center" 
-                                                VerticalAlignment="Center" MinWidth="10" Margin="3,2" SnapsToDevicePixels="True"
-                                                IsHitTestVisible="false" Visibility="Hidden" />-->
                         </Grid>
                     </Border>
                 </StackPanel>
@@ -230,9 +228,9 @@
                 <Setter Property="Text"
                         TargetName="controlLabel"
                         Value="" />
-                <Setter Property="Margin"
+                <Setter Property="Padding"
                         TargetName="downBorder"
-                        Value="0" />
+                        Value="1,0,0,0" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
@@ -251,9 +249,6 @@
                 <Setter Property="Text"
                         TargetName="controlLabel"
                         Value="" />
-                <Setter Property="Margin"
-                        TargetName="downBorder"
-                        Value="0" />
             </Trigger>
 
             <Trigger Property="IsButtonEnabled"
@@ -302,7 +297,7 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="BorderBrush"
                         TargetName="PART_ButtonBorder"
-                        Value="{DynamicResource ButtonHoverInnerBorderBrush}" />
+                        Value="{DynamicResource ButtonHoverOuterBorderBrush}" />
                 <Setter Property="Background"
                         TargetName="downBorder"
                         Value="{DynamicResource ButtonHoverOuterBorderBrush}" />
@@ -327,7 +322,7 @@
     <ControlTemplate x:Key="InnerButtonControlTemplate"
                      TargetType="{x:Type Fluent:ToggleButton}">
         <Border x:Name="border"
-                BorderThickness="1"
+                BorderThickness="0"
                 Background="{DynamicResource TransparentBrush}"
                 BorderBrush="{DynamicResource TransparentBrush}"
                 Height="Auto"
@@ -346,6 +341,7 @@
                             HorizontalAlignment="Stretch"
                             SnapsToDevicePixels="True">
                     <ContentPresenter x:Name="iconImage"
+                                      Margin="0,1,0,0"
                                       HorizontalAlignment="Center"
                                       Height="32"
                                       VerticalAlignment="Center"
@@ -428,7 +424,7 @@
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}}" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,1" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
@@ -446,7 +442,7 @@
                         Value="False" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,-1,1" />
+                        Value="2,0,-1,1" />
                 <Setter Property="VerticalAlignment"
                         TargetName="border"
                         Value="Stretch" />