Fixed an issue with sizing with max witdh

Simnico99 · Jan 8, 2024 · bde0e2b · bde0e2b
1 parent d70a39b
commit bde0e2b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/MicaWPF.Core/Controls/MicaWindow/MicaWindowInteropHandler.cs b/src/MicaWPF.Core/Controls/MicaWindow/MicaWindowInteropHandler.cs
@@ -2,6 +2,7 @@
 // This software is distributed under the MIT license and its code is open-source and free for use, modification, and distribution.
 // </copyright>
 
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Automation.Peers;
@@ -21,6 +22,9 @@ public class MicaWindowInteropHandler : MicaWindowProperty
     protected const string _buttonMaxName = "Maximize";
     protected const string _buttonRestoreName = "Restore";
 
+    private static readonly SolidColorBrush _transparentBrush = new(Color.FromArgb(0, 0, 0, 0));
+    private static readonly double _dpiScale = DpiHelper.LogicalToDeviceUnitsScalingFactorX;
+
     public MicaWindowInteropHandler()
         : base()
     {
@@ -64,12 +68,11 @@ private nint ShowSnapLayout(nint lparam, ref bool handled)
         var x = (short)(lparam.ToInt32() & 0xffff);
         var y = lparam.ToInt32() >> 16;
         var point = new Point(x, y);
-        var dpiScale = DpiHelper.LogicalToDeviceUnitsScalingFactorX;
         var button = WindowState == WindowState.Maximized ? ButtonRestore : ButtonMax;
 
         if (button != null)
         {
-            var buttonSize = new Size(button.ActualWidth * dpiScale, button.ActualHeight * dpiScale);
+            var buttonSize = new Size(button.ActualWidth * _dpiScale, button.ActualHeight * _dpiScale);
             var buttonLocation = button.PointToScreen(default);
             var rect = new Rect(buttonLocation, buttonSize);
 
@@ -81,7 +84,7 @@ private nint ShowSnapLayout(nint lparam, ref bool handled)
             }
             else
             {
-                button.Background = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
+                button.Background = _transparentBrush;
             }
 
             return PtrHelper.Create(_hTMAXBUTTON);
@@ -120,11 +123,6 @@ private nint HwndSourceHook(nint hwnd, int msg, nint n, nint lparam, ref bool ha
             return PtrHelper.Zero;
         }
 
-        if (msg == InteropValues.HwndSourceMessages.WM_GETTEXT)
-        {
-            return PtrHelper.Zero;
-        }
-
         switch (msg)
         {
             case InteropValues.HwndSourceMessages.WM_NCHITTEST:
@@ -138,6 +136,7 @@ private nint HwndSourceHook(nint hwnd, int msg, nint n, nint lparam, ref bool ha
                 HideMaximiseAndMinimiseButton(lparam, ref handled);
                 break;
             case InteropValues.HwndSourceMessages.WM_GETMINMAXINFO:
+                Debug.WriteLine("Humsmm");
                 var mmiNullable = (InteropValues.MINMAXINFO?)Marshal.PtrToStructure(lparam, typeof(InteropValues.MINMAXINFO));
                 if (mmiNullable.HasValue)
                 {
@@ -150,7 +149,6 @@ private nint HwndSourceHook(nint hwnd, int msg, nint n, nint lparam, ref bool ha
                         mmi.ptMaxSize.Y = (int)screen.Height + 8;
 
                         Marshal.StructureToPtr(mmi, lparam, true);
-                        handled = true;
                     }
                 }
 
@@ -159,7 +157,7 @@ private nint HwndSourceHook(nint hwnd, int msg, nint n, nint lparam, ref bool ha
                 var button = WindowState == WindowState.Maximized ? ButtonRestore : ButtonMax;
                 if (button is not null)
                 {
-                    button.Background = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
+                    button.Background = _transparentBrush;
                 }
 
                 break;

diff --git a/src/MicaWPF.Core/Controls/MicaWindow/MicaWindowStyle.cs b/src/MicaWPF.Core/Controls/MicaWindow/MicaWindowStyle.cs
@@ -4,7 +4,6 @@
 
 using System.Windows;
 using MicaWPF.Core.Helpers;
-using MicaWPF.Core.Services;
 
 namespace MicaWPF.Core.Controls.MicaWindow;
 

diff --git a/src/MicaWPF.Core/Extensions/DependencyObjectExtension.cs b/src/MicaWPF.Core/Extensions/DependencyObjectExtension.cs
@@ -5,7 +5,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using MicaWPF.Core.Controls;
 
 namespace MicaWPF.Core.Extensions;
 

diff --git a/src/MicaWPF/Helpers/WindowsAccentHelperWinRT.cs b/src/MicaWPF/Helpers/WindowsAccentHelperWinRT.cs
@@ -9,7 +9,7 @@
 
 namespace MicaWPF.Helpers;
 
-public class WindowsAccentHelperWinRT : WindowsAccentHelper
+public sealed class WindowsAccentHelperWinRT : WindowsAccentHelper
 {
     public override bool AreTitleBarAndBordersAccented()
     {