Skip to content
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

Jump to bottom

Fix wrong maximized window offset on non primary monitors #1921

Merged
merged 2 commits into from
Jul 11, 2019
Merged

Fix wrong maximized window offset on non primary monitors #1921

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
345a8ee
Fix wrong maximized window offset on non primary monitors
dsafa Jul 11, 2019
a2376b5
Run runformat
dsafa Jul 11, 2019
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
34 changes: 13 additions & 21 deletions src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,27 +607,19 @@ bool NonClientIslandWindow::_HandleWindowPosChanging(WINDOWPOS* const windowPos)
((suggestedWidth > maxWidth) ||
(suggestedHeight > maxHeight)))
{
auto offset = 0;
// Determine which side of the window to use for the offset
// calculation. If the taskbar is on the left or top of the screen,
// then the x or y coordinate of the work rect might not be 0.
// Check both, and use whichever is 0.
if (rcMaximum.left == 0)
{
offset = windowPos->x;
}
else if (rcMaximum.top == 0)
{
offset = windowPos->y;
}
const auto offsetX = offset;
const auto offsetY = offset;

_maximizedMargins.cxRightWidth = -offset;
_maximizedMargins.cxLeftWidth = -offset;

_maximizedMargins.cyTopHeight = -offset;
_maximizedMargins.cyBottomHeight = -offset;
RECT frame{};
// Calculate the maxmized window overhang by getting the size of the window frame.
// We use the style without WS_CAPTION otherwise the caption height is included.
// Only remove WS_DLGFRAME since WS_CAPTION = WS_DLGFRAME | WS_BORDER,
// but WS_BORDER is needed as it modifies the calculation of the width of the frame.
const auto targetStyle = windowStyle & ~WS_DLGFRAME;
AdjustWindowRectExForDpi(&frame, targetStyle, false, GetWindowExStyle(_window.get()), _currentDpi);

// Frame left and top will be negative
_maximizedMargins.cxLeftWidth = frame.left * -1;
_maximizedMargins.cyTopHeight = frame.top * -1;
_maximizedMargins.cxRightWidth = frame.right;
_maximizedMargins.cyBottomHeight = frame.bottom;

_isMaximized = true;
THROW_IF_FAILED(_UpdateFrameMargins());
Expand Down