kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Adapt WindowHelper::updateMargins for Windows 11 native resize

Browse source
This commit is contained in:
Ilya Fedin 2023-08-12 04:05:08 +04:00 • committed by John Preston
parent cbb9e0bbde
commit fd55e9b71b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/platform/win/ui_window_win.cpp
View file

@ -865,7 +865,7 @@ void WindowHelper::updateWindowFrameColors(bool active) {
} }
void WindowHelper::updateMargins() { void WindowHelper::updateMargins() {
if (::Platform::IsWindows11OrGreater() || _updatingMargins) return; if (_updatingMargins) return;
_updatingMargins = true; _updatingMargins = true;
const auto guard = gsl::finally([&] { _updatingMargins = false; }); const auto guard = gsl::finally([&] { _updatingMargins = false; });
@ -879,7 +879,9 @@ void WindowHelper::updateMargins() {
} else { } else {
AdjustWindowRectEx(&r, style, false, styleEx); AdjustWindowRectEx(&r, style, false, styleEx);
} }
auto margins = QMargins(r.left, r.top, -r.right, -r.bottom); auto margins = ::Platform::IsWindows11OrGreater()
? QMargins(0, r.top, 0, 0)
: QMargins(r.left, r.top, -r.right, -r.bottom);
if (style & WS_MAXIMIZE) { if (style & WS_MAXIMIZE) {
RECT w, m; RECT w, m;
GetWindowRect(_handle , &w); GetWindowRect(_handle , &w);
@ -936,7 +938,6 @@ void WindowHelper::updateMargins() {
} }
void WindowHelper::fixMaximizedWindow() { void WindowHelper::fixMaximizedWindow() {
if (::Platform::IsWindows11OrGreater()) return;
const auto style = GetWindowLongPtr(_handle, GWL_STYLE); const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
if (style & WS_MAXIMIZE) { if (style & WS_MAXIMIZE) {
auto w = RECT(); auto w = RECT();