Skip to content

Commit

Permalink
only recreate styles when the change isn't caused by a fullscreen update
Browse files Browse the repository at this point in the history
  • Loading branch information
@emmauss
emmauss committed Sep 26, 2023
1 parent 7cfdb00 commit 0705446
Showing 1 changed file with 95 additions and 91 deletions.
186 changes: 95 additions & 91 deletions src/Windows/Avalonia.Win32/WindowImpl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,26 @@ private void SetFullScreen(bool fullscreen)
{
if (fullscreen)
{
GetWindowRect(_hwnd, out var windowRect);
GetClientRect(_hwnd, out var clientRect);

clientRect.left += windowRect.left;
clientRect.right += windowRect.left;
clientRect.top += windowRect.top;
clientRect.bottom += windowRect.top;

_savedWindowInfo.WindowRect = clientRect;

var current = GetStyle();
var currentEx = GetExtendedStyle();

_savedWindowInfo.Style = current;
_savedWindowInfo.ExStyle = currentEx;

// Set new window style and size.
SetStyle(current & ~(WindowStyles.WS_CAPTION | WindowStyles.WS_THICKFRAME), false);
SetExtendedStyle(currentEx & ~(WindowStyles.WS_EX_DLGMODALFRAME | WindowStyles.WS_EX_WINDOWEDGE | WindowStyles.WS_EX_CLIENTEDGE | WindowStyles.WS_EX_STATICEDGE), false);

// On expand, if we're given a window_rect, grow to it, otherwise do
// not resize.
MONITORINFO monitor_info = MONITORINFO.Create();
Expand All @@ -933,6 +953,10 @@ private void SetFullScreen(bool fullscreen)
// repainted. Better-looking methods welcome.
_isFullScreenActive = false;

var windowStates = GetWindowStateStyles();
SetStyle((_savedWindowInfo.Style & ~WindowStateMask) | windowStates, false);
SetExtendedStyle(_savedWindowInfo.ExStyle, false);

// On restore, resize to the previous saved rect size.
var newClientRect = _savedWindowInfo.WindowRect.ToPixelRect();

Expand Down Expand Up @@ -1248,133 +1272,113 @@ private void UpdateWindowProperties(WindowProperties newProperties, bool forceCh
// according to the new values already.
_windowProperties = newProperties;

var exStyle = WindowStyles.WS_EX_WINDOWEDGE | (_isUsingComposition ? WindowStyles.WS_EX_NOREDIRECTIONBITMAP : 0);

if ((oldProperties.ShowInTaskbar != newProperties.ShowInTaskbar) || forceChanges)
if (oldProperties.IsFullScreen == newProperties.IsFullScreen)
{
if (newProperties.ShowInTaskbar)
{
exStyle |= WindowStyles.WS_EX_APPWINDOW;
var exStyle = WindowStyles.WS_EX_WINDOWEDGE | (_isUsingComposition ? WindowStyles.WS_EX_NOREDIRECTIONBITMAP : 0);

if (_hiddenWindowIsParent)
if ((oldProperties.ShowInTaskbar != newProperties.ShowInTaskbar) || forceChanges)
{
if (newProperties.ShowInTaskbar)
{
// Can't enable the taskbar icon by clearing the parent window unless the window
// is hidden. Hide the window and show it again with the same activation state
// when we've finished. Interestingly it seems to work fine the other way.
var shown = IsWindowVisible(_hwnd);
var activated = GetActiveWindow() == _hwnd;
exStyle |= WindowStyles.WS_EX_APPWINDOW;

if (_hiddenWindowIsParent)
{
// Can't enable the taskbar icon by clearing the parent window unless the window
// is hidden. Hide the window and show it again with the same activation state
// when we've finished. Interestingly it seems to work fine the other way.
var shown = IsWindowVisible(_hwnd);
var activated = GetActiveWindow() == _hwnd;

if (shown)
Hide();
if (shown)
Hide();

_hiddenWindowIsParent = false;
SetParent(null);
_hiddenWindowIsParent = false;
SetParent(null);

if (shown)
Show(activated, false);
if (shown)
Show(activated, false);
}
}
}
else
{
// To hide a non-owned window's taskbar icon we need to parent it to a hidden window.
if (_parent is null)
else
{
SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, OffscreenParentWindow.Handle);
_hiddenWindowIsParent = true;
// To hide a non-owned window's taskbar icon we need to parent it to a hidden window.
if (_parent is null)
{
SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, OffscreenParentWindow.Handle);
_hiddenWindowIsParent = true;
}

exStyle &= ~WindowStyles.WS_EX_APPWINDOW;
}
}

if (newProperties.ShowInTaskbar)
{
exStyle |= WindowStyles.WS_EX_APPWINDOW;
}
else
{
exStyle &= ~WindowStyles.WS_EX_APPWINDOW;
}
}

if (newProperties.ShowInTaskbar)
{
exStyle |= WindowStyles.WS_EX_APPWINDOW;
}
else
{
exStyle &= ~WindowStyles.WS_EX_APPWINDOW;
}

WindowStyles style = WindowStyles.WS_CLIPCHILDREN | WindowStyles.WS_OVERLAPPEDWINDOW | WindowStyles.WS_CLIPSIBLINGS;

if (IsWindowVisible(_hwnd))
style |= WindowStyles.WS_VISIBLE;
WindowStyles style = WindowStyles.WS_CLIPCHILDREN | WindowStyles.WS_OVERLAPPEDWINDOW | WindowStyles.WS_CLIPSIBLINGS;

if (newProperties.IsResizable)
{
style |= WindowStyles.WS_SIZEFRAME;
style |= WindowStyles.WS_MAXIMIZEBOX;
}
else
{
style &= ~WindowStyles.WS_SIZEFRAME;
style &= ~WindowStyles.WS_MAXIMIZEBOX;
}
if (IsWindowVisible(_hwnd))
style |= WindowStyles.WS_VISIBLE;

const WindowStyles fullDecorationFlags = WindowStyles.WS_CAPTION | WindowStyles.WS_SYSMENU;
if (newProperties.IsResizable)
{
style |= WindowStyles.WS_SIZEFRAME;
style |= WindowStyles.WS_MAXIMIZEBOX;
}
else
{
style &= ~WindowStyles.WS_SIZEFRAME;
style &= ~WindowStyles.WS_MAXIMIZEBOX;
}

if (newProperties.Decorations == SystemDecorations.Full)
{
style |= fullDecorationFlags;
}
else
{
style &= ~fullDecorationFlags;
const WindowStyles fullDecorationFlags = WindowStyles.WS_CAPTION | WindowStyles.WS_SYSMENU;

if (newProperties.Decorations == SystemDecorations.BorderOnly)
if (newProperties.Decorations == SystemDecorations.Full)
{
style |= WindowStyles.WS_THICKFRAME | WindowStyles.WS_BORDER;
style |= fullDecorationFlags;
}
}

if (newProperties.IsFullScreen)
{
// Apply styles here, then save the client rect for when we resume from full screen
if (!oldProperties.IsFullScreen)
else
{
SetStyle(style);
SetExtendedStyle(exStyle);
GetWindowRect(_hwnd, out var windowRect);
GetClientRect(_hwnd, out var clientRect);

clientRect.left += windowRect.left;
clientRect.right += windowRect.left;
clientRect.top += windowRect.top;
clientRect.bottom += windowRect.top;
style &= ~fullDecorationFlags;

_savedWindowInfo.WindowRect = clientRect;
if (newProperties.Decorations == SystemDecorations.BorderOnly)
{
style |= WindowStyles.WS_THICKFRAME | WindowStyles.WS_BORDER;
}
}

style &= ~(WindowStyles.WS_CAPTION | WindowStyles.WS_THICKFRAME);
exStyle &= ~(WindowStyles.WS_EX_DLGMODALFRAME | WindowStyles.WS_EX_WINDOWEDGE | WindowStyles.WS_EX_CLIENTEDGE | WindowStyles.WS_EX_STATICEDGE);
}
else
{
var windowStates = GetWindowStateStyles();
style &= ~WindowStateMask;
style |= windowStates;

_savedWindowInfo.Style = style;
_savedWindowInfo.ExStyle = exStyle;
}

if (WindowStylesCallback is { } callback)
{
var (s, e) = callback((uint)style, (uint)exStyle);

style = (WindowStyles)s;
exStyle = (WindowStyles)e;
}
if (WindowStylesCallback is { } callback)
{
var (s, e) = callback((uint)style, (uint)exStyle);

SetStyle(style);
SetExtendedStyle(exStyle);
style = (WindowStyles)s;
exStyle = (WindowStyles)e;
}

if (oldProperties.IsFullScreen != newProperties.IsFullScreen)
SetStyle(style);
SetExtendedStyle(exStyle);
}
else
SetFullScreen(newProperties.IsFullScreen);

if (!_isFullScreenActive)
{
var style = GetStyle();

var margin = newProperties.Decorations == SystemDecorations.BorderOnly ? 1 : 0;

var margins = new MARGINS
Expand Down

0 comments on commit 0705446

Please sign in to comment.