github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Win32: always return 0 in WM_NCCALCSIZE 

Otherwise will cause bugs.

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2021-11-28 20:22:08 +08:00
parent 2fafa7a433
commit 6068944657
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
framelesshelper_win32.cpp
View File

@ -245,7 +245,6 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
const auto clientRect = ((static_cast<BOOL>(msg->wParam) == FALSE) const auto clientRect = ((static_cast<BOOL>(msg->wParam) == FALSE)
? reinterpret_cast<LPRECT>(msg->lParam) ? reinterpret_cast<LPRECT>(msg->lParam)
: &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(msg->lParam))->rgrc[0]); : &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(msg->lParam))->rgrc[0]);
bool nonClientAreaExists = false;
// We don't need this correction when we're fullscreen. We will // We don't need this correction when we're fullscreen. We will
// have the WS_POPUP size, so we don't have to worry about // have the WS_POPUP size, so we don't have to worry about
// borders, and the default frame will be fine. // borders, and the default frame will be fine.
@ -261,7 +260,6 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
clientRect->bottom -= resizeBorderThickness; clientRect->bottom -= resizeBorderThickness;
clientRect->left += resizeBorderThickness; clientRect->left += resizeBorderThickness;
clientRect->right -= resizeBorderThickness; clientRect->right -= resizeBorderThickness;
nonClientAreaExists = true;
} }
// Attempt to detect if there's an autohide taskbar, and if // Attempt to detect if there's an autohide taskbar, and if
// there is, reduce our size a bit on the side with the taskbar, // there is, reduce our size a bit on the side with the taskbar,
@ -354,16 +352,12 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
if (top) { if (top) {
// Peculiarly, when we're fullscreen, // Peculiarly, when we're fullscreen,
clientRect->top += kAutoHideTaskbarThickness; clientRect->top += kAutoHideTaskbarThickness;
nonClientAreaExists = true;
} else if (bottom) { } else if (bottom) {
clientRect->bottom -= kAutoHideTaskbarThickness; clientRect->bottom -= kAutoHideTaskbarThickness;
nonClientAreaExists = true;
} else if (left) { } else if (left) {
clientRect->left += kAutoHideTaskbarThickness; clientRect->left += kAutoHideTaskbarThickness;
nonClientAreaExists = true;
} else if (right) { } else if (right) {
clientRect->right -= kAutoHideTaskbarThickness; clientRect->right -= kAutoHideTaskbarThickness;
nonClientAreaExists = true;
} }
} }
} }
@ -382,17 +376,10 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
// is not correct. It confuses QPA's internal logic. // is not correct. It confuses QPA's internal logic.
clientRect->bottom += 1; clientRect->bottom += 1;
#endif #endif
// If the window bounds change, we're going to relayout and repaint // We cannot return WVR_REDRAW otherwise Windows exhibits bugs where
// anyway. Returning WVR_REDRAW avoids an extra paint before that of // client pixels and child windows are mispositioned by the width/height
// the old client pixels in the (now wrong) location, and thus makes // of the upper-left nonclient area.
// actions like resizing a window from the left edge look slightly *result = 0;
// less broken.
//
// We cannot return WVR_REDRAW when there is nonclient area, or
// Windows exhibits bugs where client pixels and child HWNDs are
// mispositioned by the width/height of the upper-left nonclient
// area.
*result = (((static_cast<BOOL>(msg->wParam) == FALSE) || nonClientAreaExists) ? 0 : WVR_REDRAW);
return true; return true;
} }
// These undocumented messages are sent to draw themed window // These undocumented messages are sent to draw themed window