tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

simplify apply styles

pull/2128/head
Dan Walmsley 8 years ago
parent
dbacf80511
commit
07475d12f9
1 changed files with 36 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      src/Windows/Avalonia.Win32/WindowImpl.cs

69
src/Windows/Avalonia.Win32/WindowImpl.cs
View File

@ -271,7 +271,9 @@ namespace Avalonia.Win32
return; return;
} }
UpdateWMStyles(() => _decorated = value); _decorated = value;
UpdateWMStyles();
} }
public void Invalidate(Rect rect) public void Invalidate(Rect rect)
@ -884,15 +886,15 @@ namespace Avalonia.Win32
} }
} }
private void UpdateWMStyles(Action changer) private void UpdateWMStyles()
{ {
var decorated = _decorated; var style = (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE);
var resizable = _resizable; const WindowStyles controlledFlags = WindowStyles.WS_OVERLAPPEDWINDOW;
changer(); style = style | controlledFlags ^ controlledFlags;
var style = (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE) | WindowStyles.WS_OVERLAPPEDWINDOW; style |= WindowStyles.WS_OVERLAPPEDWINDOW;
if (!_decorated) if (!_decorated)
{ {
@ -904,40 +906,39 @@ namespace Avalonia.Win32
style ^= (WindowStyles.WS_SIZEFRAME); style ^= (WindowStyles.WS_SIZEFRAME);
} }
UnmanagedMethods.GetWindowRect(_hwnd, out var oldRect);
SetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE, (uint)style); SetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE, (uint)style);
if (decorated != _decorated) UnmanagedMethods.GetWindowRect(_hwnd, out var windowRect);
{
UnmanagedMethods.GetWindowRect(_hwnd, out var windowRect);
var oldThickness = BorderThickness; var oldThickness = BorderThickness;
Rect newRect; Rect newRect;
if (_decorated) if (_decorated)
{ {
var thickness = BorderThickness; var thickness = BorderThickness;
newRect = new Rect( newRect = new Rect(
windowRect.left - thickness.Left, windowRect.left - thickness.Left,
windowRect.top - thickness.Top, windowRect.top - thickness.Top,
(windowRect.right - windowRect.left) + (thickness.Left + thickness.Right), (windowRect.right - windowRect.left) + (thickness.Left + thickness.Right),
(windowRect.bottom - windowRect.top) + (thickness.Top + thickness.Bottom)); (windowRect.bottom - windowRect.top) + (thickness.Top + thickness.Bottom));
} }
else else
{ {
newRect = new Rect( newRect = new Rect(
windowRect.left + oldThickness.Left, windowRect.left + oldThickness.Left,
windowRect.top + oldThickness.Top, windowRect.top + oldThickness.Top,
(windowRect.right - windowRect.left) - (oldThickness.Left + oldThickness.Right), (windowRect.right - windowRect.left) - (oldThickness.Left + oldThickness.Right),
(windowRect.bottom - windowRect.top) - (oldThickness.Top + oldThickness.Bottom)); (windowRect.bottom - windowRect.top) - (oldThickness.Top + oldThickness.Bottom));
} }
UnmanagedMethods.SetWindowPos(_hwnd, IntPtr.Zero, (int)newRect.X, (int)newRect.Y, (int)newRect.Width, UnmanagedMethods.SetWindowPos(_hwnd, IntPtr.Zero, (int)newRect.X, (int)newRect.Y, (int)newRect.Width,
(int)newRect.Height, (int)newRect.Height,
UnmanagedMethods.SetWindowPosFlags.SWP_NOZORDER | UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED); UnmanagedMethods.SetWindowPosFlags.SWP_NOZORDER | UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
}
} }
public void CanResize(bool value) public void CanResize(bool value)
@ -947,7 +948,9 @@ namespace Avalonia.Win32
return; return;
} }
UpdateWMStyles(() => _resizable = value); _resizable = value;
UpdateWMStyles();
} }
public void SetTopmost(bool value) public void SetTopmost(bool value)

Write Preview
Loading…
Cancel
Save