consistency fix for the show desktop fix. updated task scheduler libr…

…ary. updated assembly version and change log.
ArcadeRenegade · Mar 12, 2016 · 9c7d06d · 9c7d06d
1 parent 8c812a9
commit 9c7d06d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/SidebarDiagnostics/ChangeLog.json b/SidebarDiagnostics/ChangeLog.json
@@ -1,4 +1,11 @@
 [
+  {
+    "Version": "3.3.4",
+    "Changes": [
+      "Made the \"Show Desktop\" fix for when \"Always on Top\" is disabled to be more consistent.",
+      "Want to help translate? Please visit the GitHub wiki!"
+    ]
+  },
   {
     "Version": "3.3.3",
     "Changes": [

diff --git a/SidebarDiagnostics/Properties/AssemblyInfo.cs b/SidebarDiagnostics/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.3.0")]
-[assembly: AssemblyFileVersion("3.3.3.0")]
+[assembly: AssemblyVersion("3.3.4.0")]
+[assembly: AssemblyFileVersion("3.3.4.0")]
diff --git a/SidebarDiagnostics/SidebarDiagnostics.csproj b/SidebarDiagnostics/SidebarDiagnostics.csproj
@@ -110,8 +110,8 @@
       <HintPath>..\packages\squirrel.windows.1.2.4\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Win32.TaskScheduler, Version=2.5.14.0, Culture=neutral, PublicKeyToken=0d013ddd5178a2ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\TaskScheduler.2.5.14\lib\net40\Microsoft.Win32.TaskScheduler.dll</HintPath>
+    <Reference Include="Microsoft.Win32.TaskScheduler, Version=2.5.15.0, Culture=neutral, PublicKeyToken=0d013ddd5178a2ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\TaskScheduler.2.5.15\lib\net40\Microsoft.Win32.TaskScheduler.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">

diff --git a/SidebarDiagnostics/Windows.cs b/SidebarDiagnostics/Windows.cs
@@ -154,6 +154,7 @@ public static void AddHook(Sidebar sidebar)
             _delegate = new WinEventDelegate(WinEventHook);
             _hookIntPtr = NativeMethods.SetWinEventHook(EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, _delegate, 0, 0, WINEVENT_OUTOFCONTEXT);
             _sidebar = sidebar;
+            _sidebarHwnd = new WindowInteropHelper(sidebar).Handle;
         }
 
         public static void RemoveHook()
@@ -170,6 +171,7 @@ public static void RemoveHook()
             _delegate = null;
             _hookIntPtr = null;
             _sidebar = null;
+            _sidebarHwnd = null;
         }
 
         private static string GetWindowClass(IntPtr hwnd)
@@ -191,9 +193,9 @@ private static void WinEventHook(IntPtr hWinEventHook, uint eventType, IntPtr hw
                 {
                     _sidebar.SetTopMost(false);
                 }
-                else
+                else if (_sidebar.IsTopMost)
                 {
-                    _sidebar.ClearTopMost(false);
+                    _sidebar.SetBottom(false);
                 }
             }
         }
@@ -205,6 +207,8 @@ private static void WinEventHook(IntPtr hWinEventHook, uint eventType, IntPtr hw
         private static WinEventDelegate _delegate { get; set; }
 
         private static Sidebar _sidebar { get; set; }
+
+        private static IntPtr? _sidebarHwnd { get; set; }
     }
 
     public static class Devices

diff --git a/SidebarDiagnostics/packages.config b/SidebarDiagnostics/packages.config
@@ -10,7 +10,7 @@
   <package id="OxyPlot.Wpf" version="1.0.0-unstable2039" targetFramework="net461" />
   <package id="Splat" version="1.6.2" targetFramework="net461" />
   <package id="squirrel.windows" version="1.2.4" targetFramework="net461" />
-  <package id="TaskScheduler" version="2.5.14" targetFramework="net461" />
+  <package id="TaskScheduler" version="2.5.15" targetFramework="net461" />
   <package id="VirtualDesktop" version="1.0.3" targetFramework="net461" />
   <package id="VirtualDesktop.WPF" version="1.0.3" targetFramework="net461" />
 </packages>