Fixes #206 by respecting HorizontalContentAlignment in RibbonGroupBox

fluentribbon · Dec 3, 2015 · 1205efd · 1205efd
1 parent 0c53541
commit 1205efd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml b/Fluent/Themes/Office2010/Controls/RibbonGroupBox.xaml
@@ -31,6 +31,8 @@
                 Value="Auto" />
         <Setter Property="Height"
                 Value="85" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />        
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="Background"
@@ -285,7 +287,7 @@
                                                IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                             </Grid>
                             <WrapPanel x:Name="PART_UpPanel"
-                                       HorizontalAlignment="Left"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="Stretch"
                                        Width="Auto"
                                        Height="Auto"
@@ -500,7 +502,7 @@
                                            IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Grid>
                         <WrapPanel x:Name="PART_UpPanel"
-                                   HorizontalAlignment="Left"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="Stretch"
                                    Width="Auto"
                                    Height="Auto"

diff --git a/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml b/Fluent/Themes/Office2013/Controls/RibbonGroupBox.xaml
@@ -31,6 +31,8 @@
                 Value="Auto" />
         <Setter Property="Height"
                 Value="85" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="Background"
@@ -285,7 +287,7 @@
                                                IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                             </Grid>
                             <WrapPanel x:Name="PART_UpPanel"
-                                       HorizontalAlignment="Left"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="Stretch"
                                        Width="Auto"
                                        Height="Auto"
@@ -482,7 +484,7 @@
                                            IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Grid>
                         <WrapPanel x:Name="PART_UpPanel"
-                                   HorizontalAlignment="Left"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="Stretch"
                                    Width="Auto"
                                    Height="Auto"

diff --git a/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml b/Fluent/Themes/Windows8/Controls/RibbonGroupBox.xaml
@@ -29,6 +29,8 @@
                 Value="Auto" />
         <Setter Property="Height"
                 Value="85" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="Background"
@@ -283,7 +285,7 @@
                                                IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                             </Grid>
                             <WrapPanel x:Name="PART_UpPanel"
-                                       HorizontalAlignment="Left"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="Stretch"
                                        Width="Auto"
                                        Height="Auto"
@@ -467,7 +469,7 @@
                                            IsEnabled="{Binding IsLauncherEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Grid>
                         <WrapPanel x:Name="PART_UpPanel"
-                                   HorizontalAlignment="Left"
+                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="Stretch"
                                    Width="Auto"
                                    Height="Auto"