Fixes #413 (#1050)

Updating ControlsEx commit references.

Author: Keboo

MaterialDesignToolkit.Wpf.sln

@@ -29,6 +29,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{55087897-5F09-45CA-8E12-12B36B45F262}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		paket.dependencies = paket.dependencies
+		paket.lock = paket.lock
 	EndProjectSection
 EndProject
 Global

paket-files/ControlzEx/ControlzEx/src/ControlzEx/PopupEx.cs

@@ -24,7 +24,7 @@ public static readonly DependencyProperty CloseOnMouseLeftButtonDownProperty
                                           typeof(bool),
                                           typeof(PopupEx),
                                           new PropertyMetadata(false));
-
+        
         /// <summary>
         /// Gets/sets if the popup can be closed by left mouse button down.
         /// </summary>
@@ -34,6 +34,18 @@ public bool CloseOnMouseLeftButtonDown
             set { SetValue(CloseOnMouseLeftButtonDownProperty, value); }
         }
 
+        public static readonly DependencyProperty AllowTopMostProperty
+            = DependencyProperty.Register(nameof(AllowTopMost),
+                                          typeof(bool), 
+                                          typeof(PopupEx), 
+                                          new PropertyMetadata(true));
+
+        public bool AllowTopMost
+        {
+            get { return (bool)GetValue(AllowTopMostProperty); }
+            set { SetValue(AllowTopMostProperty, value); }
+        }
+
         public PopupEx()
         {
             this.Loaded += this.PopupEx_Loaded;
@@ -84,7 +96,7 @@ private void PopupEx_Loaded(object sender, RoutedEventArgs e)
 
         private void PopupEx_Opened(object sender, EventArgs e)
         {
-            this.SetTopmostState(true);
+            this.SetTopmostState(hostWindow?.IsActive ?? true);
         }
 
         private void hostWindow_Activated(object sender, EventArgs e)
@@ -142,6 +154,7 @@ private void hostWindow_SizeOrLocationChanged(object sender, EventArgs e)
 
         private void SetTopmostState(bool isTop)
         {
+            isTop &= AllowTopMost;
             // Don’t apply state if it’s the same as incoming state
             if (this.appliedTopMost.HasValue && this.appliedTopMost == isTop)
             {

paket-files/ControlzEx/ControlzEx/src/ControlzEx/paket.dependencies

@@ -1 +1 @@
-e687c6ac4279c4e513b7ef9a75622411350db874
+e641c9e9346d7ae8c21ca1bf7fa5fb1b86496baa

paket-files/ControlzEx/ControlzEx/src/ControlzEx/paket.version

@@ -7,7 +7,7 @@ NUGET
     Dragablz (0.0.3.203)
     MahApps.Metro (1.6.5)
       ControlzEx (>= 3.0.2.4 < 4.0)
-    Microsoft.NETCore.Platforms (2.1) - restriction: == net45
+    Microsoft.NETCore.Platforms (2.1.1) - restriction: == net45
     Moq (4.9)
       Castle.Core (>= 4.3.1)
       System.Threading.Tasks.Extensions (>= 4.3)
@@ -18,6 +18,7 @@ NUGET
     NSubstitute (2.0.3)
     RhinoMocks (3.6.1)
     Shouldly (2.8.3)
+    ShowMeTheXAML (1.0.10)
     ShowMeTheXAML.AvalonEdit (1.0.10)
       AvalonEdit (>= 5.0.4 < 5.1)
       ShowMeTheXAML (>= 1.0.10 < 1.1)

paket-files/paket.restore.cached

@@ -13,7 +13,7 @@ nuget ShowMeTheXAML ~> 1.0.10
 nuget ShowMeTheXAML.AvalonEdit ~> 1.0.10
 nuget ShowMeTheXAML.MSBuild ~> 1.0.10
 
-github ControlzEx/ControlzEx:e687c6ac4279c4e513b7ef9a75622411350db874 src/ControlzEx/PopupEx.cs
-github ControlzEx/ControlzEx:e687c6ac4279c4e513b7ef9a75622411350db874 src/ControlzEx/PackIconBase.cs
-github ControlzEx/ControlzEx:e687c6ac4279c4e513b7ef9a75622411350db874 src/ControlzEx/BadgedEx.cs
+github ControlzEx/ControlzEx:e641c9e9346d7ae8c21ca1bf7fa5fb1b86496baa src/ControlzEx/PopupEx.cs
+github ControlzEx/ControlzEx:e641c9e9346d7ae8c21ca1bf7fa5fb1b86496baa src/ControlzEx/PackIconBase.cs
+github ControlzEx/ControlzEx:e641c9e9346d7ae8c21ca1bf7fa5fb1b86496baa src/ControlzEx/BadgedEx.cs
 github samueldjack/VirtualCollection:e63d891c252c2ac1a3ebb26dddb9a3d89effe3f2 VirtualCollection/VirtualCollection/VirtualizingWrapPanel.cs

paket.dependencies

@@ -49,8 +49,8 @@ NUGET
     xunit.runner.visualstudio (2.4)
 GITHUB
   remote: ControlzEx/ControlzEx
-    src/ControlzEx/BadgedEx.cs (e687c6ac4279c4e513b7ef9a75622411350db874)
-    src/ControlzEx/PackIconBase.cs (e687c6ac4279c4e513b7ef9a75622411350db874)
-    src/ControlzEx/PopupEx.cs (e687c6ac4279c4e513b7ef9a75622411350db874)
+    src/ControlzEx/BadgedEx.cs (e641c9e9346d7ae8c21ca1bf7fa5fb1b86496baa)
+    src/ControlzEx/PackIconBase.cs (e641c9e9346d7ae8c21ca1bf7fa5fb1b86496baa)
+    src/ControlzEx/PopupEx.cs (e641c9e9346d7ae8c21ca1bf7fa5fb1b86496baa)
   remote: samueldjack/VirtualCollection
     VirtualCollection/VirtualCollection/VirtualizingWrapPanel.cs (e63d891c252c2ac1a3ebb26dddb9a3d89effe3f2)