Merge pull request #1971 from MahApps/1919-JIT-Compiler-limitation-fix

jit compiler limitation fix for #1919
MahApps · Jun 11, 2015 · 212fbe4 · 212fbe4
2 parents de3cbbf + 651ecfe
commit 212fbe4
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 20 deletions.
diff --git a/MahApps.Metro/Controls/MetroWindow.cs b/MahApps.Metro/Controls/MetroWindow.cs
@@ -838,10 +838,18 @@ public override void OnApplyTemplate()
             if (RightWindowCommands == null)
                 RightWindowCommands = new WindowCommands();
 
+            LeftWindowCommands.ParentWindow = this;
+            RightWindowCommands.ParentWindow = this;
+
             LeftWindowCommandsPresenter = GetTemplateChild(PART_LeftWindowCommands) as ContentPresenter;
             RightWindowCommandsPresenter = GetTemplateChild(PART_RightWindowCommands) as ContentPresenter;
             WindowButtonCommands = GetTemplateChild(PART_WindowButtonCommands) as WindowButtonCommands;
 
+            if (WindowButtonCommands != null)
+            {
+                WindowButtonCommands.ParentWindow = this;
+            }
+
             overlayBox = GetTemplateChild(PART_OverlayBox) as Grid;
             metroDialogContainer = GetTemplateChild(PART_MetroDialogContainer) as Grid;
             flyoutModal = (Rectangle) GetTemplateChild(PART_FlyoutModal);

diff --git a/MahApps.Metro/Controls/WindowButtonCommands.cs b/MahApps.Metro/Controls/WindowButtonCommands.cs
@@ -77,6 +77,21 @@ static WindowButtonCommands()
             DefaultStyleKeyProperty.OverrideMetadata(typeof(WindowButtonCommands), new FrameworkPropertyMetadata(typeof(WindowButtonCommands)));
         }
 
+        public WindowButtonCommands()
+        {
+            this.Loaded += WindowButtonCommands_Loaded;
+        }
+
+        private void WindowButtonCommands_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.Loaded -= WindowButtonCommands_Loaded;
+            var parentWindow = this.ParentWindow;
+            if (null == parentWindow)
+            {
+                this.ParentWindow = this.TryFindParent<MetroWindow>();
+            }
+        }
+
         private string GetCaption(int id)
         {
             if (user32 == null)
@@ -93,26 +108,22 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
-            this.ParentWindow = this.TryFindParent<MetroWindow>();
-            if (this.ParentWindow != null)
+            close = Template.FindName("PART_Close", this) as Button;
+            if (close != null)
             {
-                close = Template.FindName("PART_Close", this) as Button;
-                if (close != null)
-                {
-                    close.Click += CloseClick;
-                }
+                close.Click += CloseClick;
+            }
 
-                max = Template.FindName("PART_Max", this) as Button;
-                if (max != null)
-                {
-                    max.Click += MaximizeClick;
-                }
+            max = Template.FindName("PART_Max", this) as Button;
+            if (max != null)
+            {
+                max.Click += MaximizeClick;
+            }
 
-                min = Template.FindName("PART_Min", this) as Button;
-                if (min != null)
-                {
-                    min.Click += MinimizeClick;
-                }
+            min = Template.FindName("PART_Min", this) as Button;
+            if (min != null)
+            {
+                min.Click += MinimizeClick;
             }
         }
 
@@ -127,11 +138,13 @@ protected void OnClosingWindow(ClosingWindowEventHandlerArgs args)
 
         private void MinimizeClick(object sender, RoutedEventArgs e)
         {
+            if (null == this.ParentWindow) return;
             Microsoft.Windows.Shell.SystemCommands.MinimizeWindow(this.ParentWindow);
         }
 
         private void MaximizeClick(object sender, RoutedEventArgs e)
         {
+            if (null == this.ParentWindow) return;
             if (this.ParentWindow.WindowState == WindowState.Maximized)
             {
                 Microsoft.Windows.Shell.SystemCommands.RestoreWindow(this.ParentWindow);
@@ -152,6 +165,7 @@ private void CloseClick(object sender, RoutedEventArgs e)
                 return;
             }
 
+            if (null == this.ParentWindow) return;
             this.ParentWindow.Close();
         }
 

diff --git a/MahApps.Metro/Controls/WindowCommands.cs b/MahApps.Metro/Controls/WindowCommands.cs
@@ -28,10 +28,19 @@ static WindowCommands()
             DefaultStyleKeyProperty.OverrideMetadata(typeof(WindowCommands), new FrameworkPropertyMetadata(typeof(WindowCommands)));
         }
 
-        public override void OnApplyTemplate()
+        public WindowCommands()
         {
-            base.OnApplyTemplate();
-            this.ParentWindow = this.TryFindParent<Window>();
+            this.Loaded += WindowCommands_Loaded;
+        }
+
+        private void WindowCommands_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.Loaded -= WindowCommands_Loaded;
+            var parentWindow = this.ParentWindow;
+            if (null == parentWindow)
+            {
+                this.ParentWindow = this.TryFindParent<Window>();
+            }
         }
 
         private Window _parentWindow;

diff --git a/Mahapps.Metro.Tests/MetroWindowTest.cs b/Mahapps.Metro.Tests/MetroWindowTest.cs
@@ -17,6 +17,18 @@ public async Task MetroWindowSmokeTest()
             await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>();
         }
 
+        [Fact]
+        public async Task WindowCommandsShouldHaveTheParentWindow()
+        {
+            await TestHost.SwitchToAppThread();
+
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>();
+
+            Assert.Equal(window, window.LeftWindowCommands.ParentWindow);
+            Assert.Equal(window, window.RightWindowCommands.ParentWindow);
+            Assert.Equal(window, window.WindowButtonCommands.ParentWindow);
+        }
+
         [Fact]
         public async Task ShowsRightWindowCommandsOnTopByDefault()
         {