Update ModernSystemMenu.cs

ghost1372 · Feb 25, 2025 · bafabb8 · bafabb8
1 parent 17f010c
commit bafabb8
Showing 1 changed file with 32 additions and 19 deletions.
diff --git a/dev/DevWinUI/Common/ModernSystemMenu/ModernSystemMenu.cs b/dev/DevWinUI/Common/ModernSystemMenu/ModernSystemMenu.cs
@@ -15,9 +15,9 @@ public partial class ModernSystemMenu : INotifyPropertyChanged
     private MenuFlyout titleBarMenuFlyout;
     private readonly ContentCoordinateConverter contentCoordinateConverter;
     private readonly OverlappedPresenter overlappedPresenter;
+    private bool isModernSystemMenuEnabled = true;
 
     private bool _isWindowMaximized;
-
     public bool IsWindowMaximized
     {
         get { return _isWindowMaximized; }
@@ -45,6 +45,7 @@ public ModernSystemMenu(Window window, MenuFlyout menuFlyout) : this(window)
     public ModernSystemMenu(Window window)
     {
         this.window = window;
+        ReEnableModernSystemMenu();
 
         RestoreCommand = DelegateCommand.Create(Restore, CanExecuteRestore);
         MoveCommand = DelegateCommand.Create(Move, CanExecuteMove);
@@ -71,6 +72,15 @@ public ModernSystemMenu(Window window)
         RegisterWindowMonitor();
     }
 
+    public void DisableModernSystemMenu()
+    {
+        isModernSystemMenuEnabled = false;
+    }
+    public void ReEnableModernSystemMenu()
+    {
+        isModernSystemMenuEnabled = true;
+    }
+
     private void CreateMenuFlyout()
     {
         titleBarMenuFlyout = new MenuFlyout()
@@ -199,7 +209,7 @@ private void RegisterWindowMonitor()
 
     private void OnWindowMessageReceived(object sender, WindowMessageEventArgs e)
     {
-        if (e.MessageType == (uint)NativeValues.WindowMessage.WM_SYSCOMMAND)
+        if (e.MessageType == (uint)NativeValues.WindowMessage.WM_SYSCOMMAND && isModernSystemMenuEnabled)
         {
             var sysCommand = e.Message.WParam.ToUInt32() & 0xFFF0;
 
@@ -234,30 +244,33 @@ private void OnWindowMessageReceived(object sender, WindowMessageEventArgs e)
 
     private void OnWindowMessageReceivedNonClient(object sender, WindowMessageEventArgs e)
     {
-        if (e.MessageType == (uint)NativeValues.WindowMessage.WM_NCLBUTTONDOWN)
+        if (isModernSystemMenuEnabled)
         {
-            if (titleBarMenuFlyout.IsOpen)
+            if (e.MessageType == (uint)NativeValues.WindowMessage.WM_NCLBUTTONDOWN)
             {
-                HideMenuFlyout();
+                if (titleBarMenuFlyout.IsOpen)
+                {
+                    HideMenuFlyout();
+                }
             }
-        }
-        else if (e.MessageType == (uint)NativeValues.WindowMessage.WM_NCRBUTTONUP)
-        {
-            if (e.Message.WParam.ToUInt32() is 2 && window.Content is not null && window.Content.XamlRoot is not null)
+            else if (e.MessageType == (uint)NativeValues.WindowMessage.WM_NCRBUTTONUP)
             {
-                PointInt32 screenPoint = new(e.Message.LParam.ToInt32() & 0xFFFF, e.Message.LParam.ToInt32() >> 16);
-                Point localPoint = contentCoordinateConverter.ConvertScreenToLocal(screenPoint);
-
-                FlyoutShowOptions options = new()
+                if (e.Message.WParam.ToUInt32() is 2 && window.Content is not null && window.Content.XamlRoot is not null)
                 {
-                    ShowMode = FlyoutShowMode.Standard,
-                    Position = OSVersionHelper.IsWindows11_22000_OrGreater ? new Point(localPoint.X / window.Content.XamlRoot.RasterizationScale, localPoint.Y / window.Content.XamlRoot.RasterizationScale) : new Point(localPoint.X, localPoint.Y)
-                };
+                    PointInt32 screenPoint = new(e.Message.LParam.ToInt32() & 0xFFFF, e.Message.LParam.ToInt32() >> 16);
+                    Point localPoint = contentCoordinateConverter.ConvertScreenToLocal(screenPoint);
 
-                ShowMenuFlyout(options);
+                    FlyoutShowOptions options = new()
+                    {
+                        ShowMode = FlyoutShowMode.Standard,
+                        Position = OSVersionHelper.IsWindows11_22000_OrGreater ? new Point(localPoint.X / window.Content.XamlRoot.RasterizationScale, localPoint.Y / window.Content.XamlRoot.RasterizationScale) : new Point(localPoint.X, localPoint.Y)
+                    };
+
+                    ShowMenuFlyout(options);
+                }
+                e.Result = 0;
+                e.Handled = true;
             }
-            e.Result = 0;
-            e.Handled = true;
         }
     }