Merge pull request #2575 from Deadpikle/develop

Close SplitButton popup if it loses mouse capture
MahApps · Jul 8, 2016 · b2ddc44 · b2ddc44
2 parents 1b12418 + 2e80a9e
commit b2ddc44
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/MahApps.Metro/Controls/SplitButton.cs b/MahApps.Metro/Controls/SplitButton.cs
@@ -353,12 +353,25 @@ private void PopupOpened(object sender, EventArgs e)
         {
             Mouse.Capture(this, CaptureMode.SubTree);
             Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, this.OutsideCapturedElementHandler);
+            Mouse.AddLostMouseCaptureHandler(this, this.LostMouseCaptureHandler);
+        }
+
+        private void RemoveMouseCaptureHandlers()
+        {
+            Mouse.RemovePreviewMouseDownOutsideCapturedElementHandler(this, this.OutsideCapturedElementHandler);
+            Mouse.RemoveLostMouseCaptureHandler(this, this.LostMouseCaptureHandler);
         }
 
         private void OutsideCapturedElementHandler(object sender, MouseButtonEventArgs mouseButtonEventArgs)
         {
             this.IsExpanded = false;
-            Mouse.RemovePreviewMouseDownOutsideCapturedElementHandler(this, this.OutsideCapturedElementHandler);
+            this.RemoveMouseCaptureHandlers();
+        }
+
+        private void LostMouseCaptureHandler(object sender, MouseEventArgs e)
+        {
+            this.IsExpanded = false;
+            this.RemoveMouseCaptureHandlers();
         }
     }
 }