Browse Source

Revert "Set win32 WindowStyle flags individually."

This reverts commit c4cc3514a8.
pull/2128/head
Dan Walmsley 8 years ago
parent
commit
743e61cfde
  1. 19
      src/Windows/Avalonia.Win32/WindowImpl.cs

19
src/Windows/Avalonia.Win32/WindowImpl.cs

@ -265,18 +265,13 @@ namespace Avalonia.Win32
return; return;
} }
var style = (UnmanagedMethods.WindowStyles)UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE); var style = (UnmanagedMethods.WindowStyles)UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE);
if (value) style |= UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW;
{
style |= (WindowStyles.WS_CAPTION & WindowStyles.WS_MINIMIZEBOX & WindowStyles.WS_MAXIMIZEBOX & WindowStyles.WS_SYSMENU & WindowStyles.WS_SIZEFRAME); UnmanagedMethods.RECT windowRect;
}
else UnmanagedMethods.GetWindowRect(_hwnd, out windowRect);
{
style ^= (WindowStyles.WS_CAPTION & WindowStyles.WS_MINIMIZEBOX & WindowStyles.WS_MAXIMIZEBOX & WindowStyles.WS_SYSMENU & WindowStyles.WS_SIZEFRAME);
}
UnmanagedMethods.GetWindowRect(_hwnd, out var windowRect);
Rect newRect; Rect newRect;
var oldThickness = BorderThickness; var oldThickness = BorderThickness;
@ -441,7 +436,7 @@ namespace Avalonia.Win32
0, 0,
atom, atom,
null, null,
(int)(WindowStyles.WS_CAPTION & WindowStyles.WS_MINIMIZEBOX & WindowStyles.WS_MAXIMIZEBOX & WindowStyles.WS_SYSMENU & WindowStyles.WS_SIZEFRAME), (int)UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW,
UnmanagedMethods.CW_USEDEFAULT, UnmanagedMethods.CW_USEDEFAULT,
UnmanagedMethods.CW_USEDEFAULT, UnmanagedMethods.CW_USEDEFAULT,
UnmanagedMethods.CW_USEDEFAULT, UnmanagedMethods.CW_USEDEFAULT,

Loading…
Cancel
Save