Merge branch 'develop' into patch-1

MahApps · Feb 19, 2017 · 3bb0c7f · 3bb0c7f
2 parents 0bfbab2 + 64c3a87
commit 3bb0c7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docs/release-notes/1.5.0.md b/docs/release-notes/1.5.0.md
@@ -10,6 +10,7 @@
     + `ItemCommand` and `OptionsItemCommand`
     + `Command` for `HamburgerMenuItem`
     + New property `PaneForeground` for HamburgerMenu and Splitview and new Foreground/Background brushes `MahApps.Metro.HamburgerMenu.PaneBackgroundBrush`, `MahApps.Metro.HamburgerMenu.PaneForegroundBrush`
+- If `ShowInTaskbar = false`, when double click on the title bar of a minimized window, the window will be restored instead of maximized. [#2854](https://github.com/MahApps/MahApps.Metro/pull/2854) [@hausenism](https://github.com/hausenism)
 
 ## Closed Issues
 

diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/MetroWindow.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/MetroWindow.cs
@@ -1296,13 +1296,13 @@ internal static void DoWindowTitleThumbChangeWindowStateOnMouseDoubleClick(Metro
                 var isMouseOnTitlebar = mousePos.Y <= window.TitlebarHeight && window.TitlebarHeight > 0;
                 if (canResize && isMouseOnTitlebar)
                 {
-                    if (window.WindowState == WindowState.Maximized)
+                    if (window.WindowState == WindowState.Normal)
                     {
-                        Microsoft.Windows.Shell.SystemCommands.RestoreWindow(window);
+                        Microsoft.Windows.Shell.SystemCommands.MaximizeWindow(window);
                     }
                     else
                     {
-                        Microsoft.Windows.Shell.SystemCommands.MaximizeWindow(window);
+                        Microsoft.Windows.Shell.SystemCommands.RestoreWindow(window);
                     }
                     mouseButtonEventArgs.Handled = true;
                 }