Skip to content

Fix DeferWorkArea not finalizing when shell #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josuave merged 1 commit into from
Sep 8, 2026
Merged

Fix DeferWorkArea not finalizing when shell #169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions src/ManagedShell.AppBar/AppBarWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,23 @@ public bool AllowAutoHide
protected double AutoHideAnimationMs = 300;
protected double AutoHideShowAnimationMs = 150;

private bool _deferWorkArea;
private bool _previouslyDeferredWorkArea;
public bool DeferWorkArea
{
get => _deferWorkArea;
set
{
bool oldValue = _deferWorkArea;
_deferWorkArea = value;
if (oldValue && oldValue != value)
{
_previouslyDeferredWorkArea = true;
UpdatePosition();
}
}
}

private bool _isDragWithin;
private bool _isMouseWithin;
private bool _isContextMenuOpen;
Expand Down Expand Up @@ -522,6 +539,13 @@ protected virtual IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lPa

// Determine if our window rect has changed and update the cached values
bool changed = false;
if (_previouslyDeferredWorkArea)
{
// We will get another WM_WINDOWPOSCHANGED when DeferWorkArea is disabled again,
// and we always want to process it
changed = true;
_previouslyDeferredWorkArea = false;
}
if ((wndPos.flags & NativeMethods.SetWindowPosFlags.SWP_NOMOVE) == 0 &&
(wndPos.y != WindowRect.Top || wndPos.x != WindowRect.Left))
{
Expand Down Expand Up @@ -716,12 +740,11 @@ protected internal NativeMethods.Rect GetDesiredRect()
return rect;
}

public bool DeferWorkArea { get; set; }

protected internal bool SetWindowPosition(NativeMethods.Rect newRect)
{
var currentRect = WindowRect;
if (newRect.Top == currentRect.Top &&
if (!_previouslyDeferredWorkArea &&
newRect.Top == currentRect.Top &&
newRect.Left == currentRect.Left &&
newRect.Bottom == currentRect.Bottom &&
newRect.Right == currentRect.Right)
Expand Down