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

update wmstyles in single place, and implement nccalc size message.

pull/2128/head
Dan Walmsley 8 years ago
parent
c8515ebea0
commit
053e6a2be5
2 changed files with 79 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
  2. 113
      src/Windows/Avalonia.Win32/WindowImpl.cs

20
src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
View File

@ -1181,6 +1181,26 @@ namespace Avalonia.Win32.Interop
}
}
[StructLayout(LayoutKind.Sequential)]
public struct WINDOWPOS
{
public IntPtr hwnd;
public IntPtr hwndInsertAfter;
public int x;
public int y;
public int cx;
public int cy;
public uint flags;
}
[StructLayout(LayoutKind.Sequential)]
public struct NCCALCSIZE_PARAMS
{
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public RECT[] rgrc;
public WINDOWPOS lppos;
}
public struct TRACKMOUSEEVENT
{
public int cbSize;

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

@ -35,6 +35,7 @@ namespace Avalonia.Win32
private bool _decorated = true;
private bool _resizable = true;
private bool _topmost = false;
private bool _taskbarIcon = true;
private double _scaling = 1;
private WindowState _showWindowState;
private WindowState _lastWindowState;
@ -96,7 +97,8 @@ namespace Avalonia.Win32
{
var style = UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE);
var exStyle = UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_EXSTYLE);
var padding = new UnmanagedMethods.RECT();
var padding = new RECT();
if (UnmanagedMethods.AdjustWindowRectEx(ref padding, style, false, exStyle))
{
@ -265,66 +267,27 @@ namespace Avalonia.Win32
return;
}
var style = (UnmanagedMethods.WindowStyles)UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE);
style |= UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW;
if (!value)
{
style ^= (WindowStyles.WS_CAPTION & WindowStyles.WS_MINIMIZEBOX & WindowStyles.WS_MAXIMIZEBOX & WindowStyles.WS_SYSMENU);
if (!_resizable)
{
style ^= (UnmanagedMethods.WindowStyles.WS_SIZEFRAME);
}
}
UnmanagedMethods.RECT windowRect;
UnmanagedMethods.GetWindowRect(_hwnd, out windowRect);
_decorated = value;
Rect newRect;
UpdateWMStyles();
UnmanagedMethods.GetWindowRect(_hwnd, out var windowRect);
var oldThickness = BorderThickness;
UnmanagedMethods.SetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE, (uint)style);
var thickness = BorderThickness;
_decorated = value;
newRect = new Rect(
var newRect = new Rect(
windowRect.left - thickness.Left,
windowRect.top - thickness.Top,
(windowRect.right - windowRect.left) + (thickness.Left + thickness.Right),
(windowRect.bottom - windowRect.top) + (thickness.Top + thickness.Bottom));
if(!value)
{
RECT rc = new RECT();
uint style1 = UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE);
uint styleEx1 = UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_EXSTYLE);
UnmanagedMethods.AdjustWindowRectEx(ref rc, style1, false, styleEx1);
}
UnmanagedMethods.SetWindowPos(_hwnd, IntPtr.Zero, (int)newRect.X, (int)newRect.Y, (int)newRect.Width,
(int)newRect.Height,
UnmanagedMethods.SetWindowPosFlags.SWP_NOZORDER | UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE);
if(_decorated)
{
if (_resizable)
{
// If we switch decorations back on we need to restore WS_SizeFrame.
_resizable = false;
CanResize(true);
}
else
{
_resizable = true;
CanResize(false);
}
}
}
public void Invalidate(Rect rect)
@ -490,8 +453,23 @@ namespace Avalonia.Win32
return IntPtr.Zero;
case WindowsMessage.WM_NCCALCSIZE:
if (!_decorated)
if (ToInt32(wParam) == 1 && !_decorated)
{
// Calculate new NCCALCSIZE_PARAMS based on custom NCA inset.
var pncsp = Marshal.PtrToStructure<NCCALCSIZE_PARAMS>(lParam);
pncsp.rgrc[0].left = pncsp.rgrc[0].left + 0;
pncsp.rgrc[0].top = pncsp.rgrc[0].top + 0;
pncsp.rgrc[0].right = pncsp.rgrc[0].right - 0;
pncsp.rgrc[0].bottom = pncsp.rgrc[0].bottom - 0;
//lRet = 0;
// No need to pass the message on to the DefWindowProc.
//fCallDWP = false;
return IntPtr.Zero;
}
break;
@ -897,14 +875,23 @@ namespace Avalonia.Win32
return (int)(ptr.ToInt64() & 0xffffffff);
}
public void ShowTaskbarIcon(bool value)
{
if(_taskbarIcon == value)
{
return;
}
_taskbarIcon = value;
var style = (UnmanagedMethods.WindowStyles)UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_EXSTYLE);
style &= ~(UnmanagedMethods.WindowStyles.WS_VISIBLE);
style |= UnmanagedMethods.WindowStyles.WS_EX_TOOLWINDOW;
if (value)
style |= UnmanagedMethods.WindowStyles.WS_EX_APPWINDOW;
else
@ -920,23 +907,41 @@ namespace Avalonia.Win32
}
}
public void CanResize(bool value)
private void UpdateWMStyles()
{
if (value == _resizable)
var style = (UnmanagedMethods.WindowStyles)UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE);
style |= UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW;
if (!_decorated)
{
return;
style ^= (WindowStyles.WS_CAPTION & WindowStyles.WS_MINIMIZEBOX & WindowStyles.WS_MAXIMIZEBOX & WindowStyles.WS_SYSMENU);
}
var style = (UnmanagedMethods.WindowStyles)UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE);
if (value)
if (_resizable)
{
style |= UnmanagedMethods.WindowStyles.WS_SIZEFRAME;
}
else
style &= ~(UnmanagedMethods.WindowStyles.WS_SIZEFRAME);
{
style ^= (UnmanagedMethods.WindowStyles.WS_SIZEFRAME);
}
UnmanagedMethods.SetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE, (uint)style);
var thickness = BorderThickness;
}
public void CanResize(bool value)
{
if (value == _resizable)
{
return;
}
_resizable = value;
UpdateWMStyles();
}
public void SetTopmost(bool value)

Write Preview
Loading…
Cancel
Save