Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

Update. 

When WM_NCHITTEST is triggered, the mouse is in the client area already.

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-04-10 11:21:19 +08:00
parent 9df3436bcf
commit febedce103
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
winnativeeventfilter.cpp
View File

@ -512,6 +512,9 @@ bool WinNativeEventFilter::nativeEventFilter(const QByteArray &eventType,
const LONG ww = clientRect.right; const LONG ww = clientRect.right;
const LONG wh = clientRect.bottom; const LONG wh = clientRect.bottom;
POINT mouse; POINT mouse;
// Don't use HIWORD or LOWORD because their results are unsigned numbers
// however the cursor position may be negative due to in a different
// monitor.
mouse.x = GET_X_LPARAM(_lParam); mouse.x = GET_X_LPARAM(_lParam);
mouse.y = GET_Y_LPARAM(_lParam); mouse.y = GET_Y_LPARAM(_lParam);
m_lpScreenToClient(_hWnd, &mouse); m_lpScreenToClient(_hWnd, &mouse);
@ -519,10 +522,8 @@ bool WinNativeEventFilter::nativeEventFilter(const QByteArray &eventType,
const LONG bw = borderWidth(_hWnd); const LONG bw = borderWidth(_hWnd);
const LONG bh = borderHeight(_hWnd); const LONG bh = borderHeight(_hWnd);
const LONG tbh = titlebarHeight(_hWnd); const LONG tbh = titlebarHeight(_hWnd);
const bool isInsideWindow = (mouse.x > 0) && (mouse.x < ww) &&
(mouse.y > 0) && (mouse.y < wh);
const qreal dpr = getDevicePixelRatioForWindow(_hWnd); const qreal dpr = getDevicePixelRatioForWindow(_hWnd);
const bool isTitlebar = isInsideWindow && (mouse.y < tbh) && const bool isTitlebar = (mouse.y < tbh) &&
!isInSpecificAreas(mouse.x, mouse.y, !isInSpecificAreas(mouse.x, mouse.y,
_data->windowData.ignoreAreas, dpr) && _data->windowData.ignoreAreas, dpr) &&
(_data->windowData.draggableAreas.isEmpty() (_data->windowData.draggableAreas.isEmpty()
@ -536,13 +537,12 @@ bool WinNativeEventFilter::nativeEventFilter(const QByteArray &eventType,
} }
return HTCLIENT; return HTCLIENT;
} }
const bool isTop = isInsideWindow && (mouse.y < bh); const bool isTop = mouse.y < bh;
const bool isBottom = isInsideWindow && (mouse.y > (wh - bh)); const bool isBottom = mouse.y > (wh - bh);
// Make the border wider to let the user easy to resize on corners. // Make the border wider to let the user easy to resize on corners.
const int factor = (isTop || isBottom) ? 2 : 1; const int factor = (isTop || isBottom) ? 2 : 1;
const bool isLeft = isInsideWindow && (mouse.x < (bw * factor)); const bool isLeft = mouse.x < (bw * factor);
const bool isRight = const bool isRight = mouse.x > (ww - (bw * factor));
isInsideWindow && (mouse.x > (ww - (bw * factor)));
const bool fixedSize = _data->windowData.fixedSize; const bool fixedSize = _data->windowData.fixedSize;
const auto getBorderValue = [fixedSize](int value) -> int { const auto getBorderValue = [fixedSize](int value) -> int {
// HTBORDER: un-resizeable window border. // HTBORDER: un-resizeable window border.