fix visibility for Icon

MahApps · Feb 25, 2015 · 1e2c54e · 1e2c54e
1 parent 2f14b40
commit 1e2c54e
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 7 deletions.
diff --git a/MahApps.Metro/Controls/MetroWindow.cs b/MahApps.Metro/Controls/MetroWindow.cs
@@ -324,7 +324,7 @@ private static void OnShowIconOnTitleBarPropertyChangedCallback(DependencyObject
             var window = (MetroWindow)d;
             if (e.NewValue != e.OldValue)
             {
-                window.SetVisibiltyForIcon((bool)e.NewValue);
+                window.SetVisibiltyForIcon();
             }
         }
 
@@ -492,21 +492,20 @@ private static void TitlebarHeightPropertyChangedCallback(DependencyObject depen
             }
         }
 
-        private void SetVisibiltyForIcon(bool visible)
+        private void SetVisibiltyForIcon()
         {
             if (this.icon != null)
             {
-                var iconVisibility = (this.IconOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) && !this.ShowTitleBar)
-                                     || (visible && this.ShowTitleBar)
-                    ? Visibility.Visible
-                    : Visibility.Collapsed;
+                var isVisible = (this.IconOverlayBehavior.HasFlag(WindowCommandsOverlayBehavior.HiddenTitleBar) && !this.ShowTitleBar)
+                                || (this.ShowIconOnTitleBar && this.ShowTitleBar);
+                var iconVisibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
                 this.icon.Visibility = iconVisibility;
             }
         }
 
         private void SetVisibiltyForAllTitleElements(bool visible)
         {
-            this.SetVisibiltyForIcon(visible);
+            this.SetVisibiltyForIcon();
             var newVisibility = visible && this.ShowTitleBar ? Visibility.Visible : Visibility.Collapsed;
             if (this.titleBar != null)
             {

diff --git a/Mahapps.Metro.Tests/MetroWindowTest.cs b/Mahapps.Metro.Tests/MetroWindowTest.cs
@@ -38,6 +38,57 @@ public async Task IconShouldBeVisibleByDefault()
             Assert.Equal(Visibility.Visible, icon.Visibility);
         }
 
+        [Fact]
+        public async Task IconShouldBeCollapsedWithShowIconOnTitleBarFalse()
+        {
+            await TestHost.SwitchToAppThread();
+
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>(w => w.ShowIconOnTitleBar = false);
+            var icon = window.GetPart<ContentControl>("PART_Icon");
+
+            Assert.Equal(Visibility.Collapsed, icon.Visibility);
+        }
+
+        [Fact]
+        public async Task IconShouldBeCollapsedWithShowTitleBarFalse()
+        {
+            await TestHost.SwitchToAppThread();
+
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>(w => w.ShowTitleBar = false);
+            var icon = window.GetPart<ContentControl>("PART_Icon");
+
+            Assert.Equal(Visibility.Collapsed, icon.Visibility);
+        }
+
+        [Fact]
+        public async Task IconShouldBeVisibleWithShowTitleBarFalseAndOverlayBehaviorHiddenTitleBar()
+        {
+            await TestHost.SwitchToAppThread();
+
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>(w => {
+                                                                                         w.IconOverlayBehavior = WindowCommandsOverlayBehavior.HiddenTitleBar;
+                                                                                         w.ShowTitleBar = false;
+                                                                                     });
+            var icon = window.GetPart<ContentControl>("PART_Icon");
+
+            Assert.Equal(Visibility.Visible, icon.Visibility);
+        }
+
+        [Fact]
+        public async Task IconShouldBeHiddenWithChangedShowIconOnTitleBar()
+        {
+            await TestHost.SwitchToAppThread();
+
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>();
+            var icon = window.GetPart<ContentControl>("PART_Icon");
+
+            Assert.Equal(Visibility.Visible, icon.Visibility);
+
+            window.ShowIconOnTitleBar = false;
+
+            Assert.Equal(Visibility.Collapsed, icon.Visibility);
+        }
+
         [Fact]
         public async Task IconCanOverlayHiddenTitlebar()
         {