From be1114b404553abd3733e28f669ada21a44e1a41 Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Tue, 28 Oct 2025 16:08:37 +0000 Subject: [PATCH] Fix/win32 no border sysmenu (#19923) * remove ws_sysmenu from non full decoration windows * update decorated window sample to not resize on maximize --- samples/ControlCatalog/DecoratedWindow.xaml.cs | 3 ++- src/Windows/Avalonia.Win32/WindowImpl.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/ControlCatalog/DecoratedWindow.xaml.cs b/samples/ControlCatalog/DecoratedWindow.xaml.cs index c97b157040..eccfaca60f 100644 --- a/samples/ControlCatalog/DecoratedWindow.xaml.cs +++ b/samples/ControlCatalog/DecoratedWindow.xaml.cs @@ -19,7 +19,8 @@ namespace ControlCatalog ctl.Cursor = new Cursor(cursor); ctl.PointerPressed += (i, e) => { - BeginResizeDrag(edge, e); + if (WindowState == WindowState.Normal) + BeginResizeDrag(edge, e); }; } diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index 1318ef721f..769a8d6768 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -1484,7 +1484,7 @@ namespace Avalonia.Win32 else style &= ~WindowStyles.WS_MAXIMIZEBOX; - const WindowStyles fullDecorationFlags = WindowStyles.WS_CAPTION | WindowStyles.WS_BORDER; + const WindowStyles fullDecorationFlags = WindowStyles.WS_CAPTION | WindowStyles.WS_BORDER | WindowStyles.WS_SYSMENU; if (newProperties.Decorations == SystemDecorations.Full) {