Browse Source
Fix/win32 no border sysmenu (#19923)
* remove ws_sysmenu from non full decoration windows
* update decorated window sample to not resize on maximize
fixes/gpu-interop-check-dedicated-allocation-needed
Emmanuel Hansen
3 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
2 deletions
-
samples/ControlCatalog/DecoratedWindow.xaml.cs
-
src/Windows/Avalonia.Win32/WindowImpl.cs
|
|
@ -19,7 +19,8 @@ namespace ControlCatalog |
|
|
ctl.Cursor = new Cursor(cursor); |
|
|
ctl.Cursor = new Cursor(cursor); |
|
|
ctl.PointerPressed += (i, e) => |
|
|
ctl.PointerPressed += (i, e) => |
|
|
{ |
|
|
{ |
|
|
BeginResizeDrag(edge, e); |
|
|
if (WindowState == WindowState.Normal) |
|
|
|
|
|
BeginResizeDrag(edge, e); |
|
|
}; |
|
|
}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -1481,7 +1481,7 @@ namespace Avalonia.Win32 |
|
|
else |
|
|
else |
|
|
style &= ~WindowStyles.WS_MAXIMIZEBOX; |
|
|
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) |
|
|
if (newProperties.Decorations == SystemDecorations.Full) |
|
|
{ |
|
|
{ |
|
|
|
