Disable close, move, resize, maximize, minimize for disabled X11Window

AvaloniaUI · Oct 26, 2023 · 982315a · 982315a
1 parent 8da8100
commit 982315a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
@@ -287,11 +287,15 @@ private void UpdateMotifHints()
                 || _systemDecorations == SystemDecorations.None) 
                 decorations = 0;
 
-            if (!_canResize)
+            if (!_canResize || !IsEnabled)
             {
                 functions &= ~(MotifFunctions.Resize | MotifFunctions.Maximize);
                 decorations &= ~(MotifDecorations.Maximize | MotifDecorations.ResizeH);
             }
+            if (!IsEnabled)
+            {
+                functions &= ~(MotifFunctions.Resize | MotifFunctions.Minimize);
+            }
 
             var hints = new MotifWmHints
             {
@@ -565,7 +569,7 @@ private void OnEvent(ref XEvent ev)
                 {
                     if (ev.ClientMessageEvent.ptr1 == _x11.Atoms.WM_DELETE_WINDOW)
                     {
-                        if (Closing?.Invoke(WindowCloseReason.WindowClosing) != true)
+                        if (IsEnabled && Closing?.Invoke(WindowCloseReason.WindowClosing) != true)
                             Dispose();
                     }
                     else if (ev.ClientMessageEvent.ptr1 == _x11.Atoms._NET_WM_SYNC_REQUEST)
@@ -1261,6 +1265,7 @@ public void SetEnabled(bool enable)
             _disabled = !enable;
 
             UpdateWMHints();
+            UpdateMotifHints();
         }
 
         private void UpdateWMHints()