Browse Source
Set WS_MINIMIZEBOX and WS_MAXIMIZEBOX for all decoration modes (#20937)
pull/20942/head
Julien Lebosquain
5 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
6 additions and
7 deletions
-
src/Windows/Avalonia.Win32/WindowImpl.cs
|
|
|
@ -1472,13 +1472,6 @@ namespace Avalonia.Win32 |
|
|
|
{ |
|
|
|
case WindowDecorations.Full: |
|
|
|
style |= WindowStyles.WS_BORDER | WindowStyles.WS_CAPTION | WindowStyles.WS_SYSMENU; |
|
|
|
|
|
|
|
if (newProperties.IsMinimizable) |
|
|
|
style |= WindowStyles.WS_MINIMIZEBOX; |
|
|
|
|
|
|
|
if (newProperties.IsMaximizable || (newProperties.WindowState == WindowState.Maximized && newProperties.IsResizable)) |
|
|
|
style |= WindowStyles.WS_MAXIMIZEBOX; |
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
case WindowDecorations.BorderOnly: |
|
|
|
@ -1486,6 +1479,12 @@ namespace Avalonia.Win32 |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
if (newProperties.IsMinimizable) |
|
|
|
style |= WindowStyles.WS_MINIMIZEBOX; |
|
|
|
|
|
|
|
if (newProperties.IsMaximizable || (newProperties.WindowState == WindowState.Maximized && newProperties.IsResizable)) |
|
|
|
style |= WindowStyles.WS_MAXIMIZEBOX; |
|
|
|
|
|
|
|
if (newProperties.Decorations != WindowDecorations.None && newProperties.IsResizable) |
|
|
|
style |= WindowStyles.WS_THICKFRAME; |
|
|
|
|
|
|
|
|
