From 05cfdd74f6b31258c138652afc893e18c395a66a Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Tue, 13 Jul 2021 19:41:35 +0200
Subject: [PATCH] Moving minimize button to the right for #948

---
 Changelog.md                                        | 3 +++
 Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fc3f8f104..62165ae0e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,9 @@
   - [#870](../../issues/870) - Add .NET 5 and .NET Core 3.1 and remove .NET Core 3.0  
   Support for .NET Core 3.0 was removed and support for .NET Core 3.1 and .NET 5.0 was added
   - Increasing ControlzEx dependency version to >= 5
+  - [#948](../../issues/948) - Minimize button misplaced  
+    Minimize button is moved to the right hand side of it's parent container.  
+    That means custom toolbar items are not moving the button further left anymore.
 
 **The following resources were added, renamed or removed ("---" indicates added when in column "Old" and removed when in column "New"):**
 
diff --git a/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml b/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
index 81ac2e8d5..28487ef22 100644
--- a/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
+++ b/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
@@ -283,6 +283,10 @@
                             Grid.Column="3"
                             Orientation="Horizontal"
                             Margin="0,0,0,1">
+                    <StackPanel x:Name="PART_ToolbarPanel"
+                                Visibility="{Binding IsToolBarVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
+                                Orientation="Horizontal" />
+                    
                     <Fluent:ToggleButton x:Name="PART_MinimizeButton"
                                          Margin="0"
                                          Width="22"
@@ -291,10 +295,6 @@
                                          Style="{DynamicResource Fluent.Ribbon.Styles.RibbonTabControl.MinimizeToggleButton}"
                                          IsChecked="{Binding Path=IsMinimized, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                          Visibility="{TemplateBinding CanMinimize, Converter={StaticResource boolToVisibilityConverter}}" />
-
-                    <StackPanel x:Name="PART_ToolbarPanel"
-                                Visibility="{Binding IsToolBarVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
-                                Orientation="Horizontal" />
                 </StackPanel>
             </Grid>