refs #18

JwlMediaWin.Core/Fixer.cs

@@ -195,13 +195,21 @@ private FixerStatus ExecuteInternal(
             const uint NoCopyBitsFlag = 0x0100;
             const uint NoSendChangingFlag = 0x0400;
 
-            const int adjustment = 34;
-            const int border = 8;
+            // the window used to have a non-transparent titlebar so we could
+            // just remove it by trimming the top margin...
+            // const int adjustment = 34; // adjustment for titlebar
+            // const int border = 8; // adjustment for borders
+
+            // ... but in Jan 2021 the title bar became transparent and so 
+            // it needed to be retained. However, the command buttons top right
+            // can be 'removed' (see below)
+            const int adjustment = 1; // adjustment for titlebar
+            const int border = 8; // adjustment for borders
 
             // this Sleep is definitely required. Without it, the media window may remain
             // on the primary display (i.e. the SetWindowPos call is ineffective). See #5
             Thread.Sleep(500);
-
+            
             NativeMethods.SetWindowPos(
                 mainHandle,
                 insertAfterValue,
@@ -215,6 +223,15 @@ private FixerStatus ExecuteInternal(
 
             EnsureWindowIsNonSizeable(mainHandle);
 
+            // to 'remove' the command buttons from the transparent title bar
+            // we move focus to the main JWL window and then disable the media
+            // window meaning it can no longer gain focus via mouse click. This
+            // doesn't prevent the button being displayed if you alt-tab to the
+            // media window but it is a small change that is generally helpful.
+
+            NativeMethods.SetForegroundWindow(coreHandle);
+            NativeMethods.EnableWindow(mainHandle, false);
+
             return result;
         }
 

JwlMediaWin.Core/NativeMethods.cs

@@ -17,6 +17,10 @@ internal static class NativeMethods
         [DllImport("user32.dll")]
         internal static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
 
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnableWindow(IntPtr hWnd, bool bEnable);
+
         [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
         internal static extern IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex);
 

JwlMediaWin/ViewModel/NotifyIconViewModel.cs

@@ -1,7 +1,6 @@
-using System;
-
-namespace JwlMediaWin.ViewModel
+namespace JwlMediaWin.ViewModel
 {
+    using System;
     using System.Diagnostics;
     using System.Threading.Tasks;
     using System.Windows;

SolutionInfo.cs

@@ -2,8 +2,8 @@
 
 [assembly: AssemblyCompany("SoundBox")]
 [assembly: AssemblyProduct("JwlMediaWin")]
-[assembly: AssemblyCopyright("Copyright © 2019 Antony Corbett")]
+[assembly: AssemblyCopyright("Copyright © 2021 Antony Corbett")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.0.9")]
+[assembly: AssemblyVersion("1.1.0.1")]