Fixing fluentribbon#459 by changing alignment for Middle and Small size

dady8889 · Aug 23, 2017 · 8c98bc1 · 8c98bc1
1 parent 805c08b
commit 8c98bc1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -147,6 +147,7 @@
   - [#446](../../issues/446) - Wrong submenu Position in application menu
   - [#450](../../issues/450) - Fix Ribbon.OnTitleBarChanged clearing the new title bar instead of the old one (thanks @Cubey2019)
   - [#457](../../issues/457) - Using the keytip shortcut to open a backstage briefly opens it, then closes it immediately
+  - [#459](../../issues/459) - Label of the Spinner disappears, if there isn't enough place
 
 - ### Enhancements
   - `LayoutTransform` and `RenderTransform` can now be used directly on `RibbonWindow` as this now gets forwarded to the first template child of the window. Have a look at `TestWindow` in the showcase application for an example on how to use it. This was added as the fix for [#430](../../issues/430).

diff --git a/Fluent.Ribbon/Themes/Controls/ComboBox.xaml b/Fluent.Ribbon/Themes/Controls/ComboBox.xaml
@@ -572,12 +572,18 @@
                 <Setter Property="Visibility"
                         TargetName="textBlock"
                         Value="Collapsed" />
+                <Setter Property="HorizontalAlignment"
+                        TargetName="PART_ContentBorder"
+                        Value="Left" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Small">
                 <Setter Property="Visibility"
                         TargetName="stackPanel"
                         Value="Collapsed" />
+                <Setter Property="HorizontalAlignment"
+                        TargetName="PART_ContentBorder"
+                        Value="Left" />
             </Trigger>
 
             <Trigger Property="IsEnabled"

diff --git a/Fluent.Ribbon/Themes/Controls/Spinner.xaml b/Fluent.Ribbon/Themes/Controls/Spinner.xaml
@@ -337,12 +337,18 @@
                             <Setter Property="Visibility"
                                     TargetName="textBlock"
                                     Value="Collapsed" />
+                            <Setter Property="HorizontalAlignment"
+                                    TargetName="border"
+                                    Value="Left" />
                         </Trigger>
                         <Trigger Property="Size"
                                  Value="Small">
                             <Setter Property="Visibility"
                                     TargetName="stackPanel"
                                     Value="Collapsed" />
+                            <Setter Property="HorizontalAlignment"
+                                    TargetName="border"
+                                    Value="Left" />
                         </Trigger>
                         <Trigger Property="IsMouseOver"
                                  Value="True">