From f452b4a64bbef0d84518499a663dc527527d11b9 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 07 12月 2023 16:58:44 +0800
Subject: [PATCH] Fix mistake of calculating wrong size
---
src/core/contexts/win32windowcontext_p.h | 3
src/core/contexts/win32windowcontext.cpp | 495 ++++++++++++++++++++++++++++--------------------------
2 files changed, 259 insertions(+), 239 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index c5c1cbd..27e5347 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -394,7 +394,10 @@
public:
bool nativeEventFilter(const QByteArray &eventType, void *message,
QT_NATIVE_EVENT_RESULT_TYPE *result) override {
- Q_UNUSED(eventType);
+ Q_UNUSED(eventType)
+
+ auto orgLastMessageContext = lastMessageContext;
+ lastMessageContext = nullptr;
// It has been observed that the pointer that Qt gives us is sometimes null on some
// machines. We need to guard against it in such scenarios.
@@ -402,16 +405,23 @@
return false;
}
- if (lastMessageHandled) {
- *result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(lastMessageResult);
- return true;
+ // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1546
+ // Qt needs to refer to the WM_NCCALCSIZE message data that hasn't been processed, so we
+ // have to process it after Qt acquired the initial data.
+ auto msg = reinterpret_cast<const MSG *>(message);
+ if (msg->message == WM_NCCALCSIZE && orgLastMessageContext) {
+ LRESULT res;
+ if (Win32WindowContext::nonClientCalcSizeHandler(msg->hwnd, msg->message,
+ msg->wParam, msg->lParam, &res)) {
+ *result = decltype(*result)(res);
+ return true;
+ }
}
return false;
}
- static bool lastMessageHandled;
- static LRESULT lastMessageResult;
static WindowsNativeEventFilter *instance;
+ static Win32WindowContext *lastMessageContext;
static inline void install() {
instance = new WindowsNativeEventFilter();
@@ -425,9 +435,8 @@
}
};
- bool WindowsNativeEventFilter::lastMessageHandled = false;
- LRESULT WindowsNativeEventFilter::lastMessageResult = 0;
WindowsNativeEventFilter *WindowsNativeEventFilter::instance = nullptr;
+ Win32WindowContext *WindowsNativeEventFilter::lastMessageContext = nullptr;
// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1025
// We can see from the source code that Qt will filter out some messages first and then send the
@@ -494,19 +503,26 @@
return ::DefWindowProcW(hWnd, message, wParam, lParam);
}
+ // Since Qt does the necessary processing of the WM_NCCALCSIZE message, we need to
+ // forward it right away and process it in our native event filter.
+ if (message == WM_NCCALCSIZE) {
+ WindowsNativeEventFilter::lastMessageContext = ctx;
+ return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
+ }
+
// Try hooked procedure and save result
- auto &handled = WindowsNativeEventFilter::lastMessageHandled;
- auto &result = WindowsNativeEventFilter::lastMessageResult;
- handled = ctx->windowProc(hWnd, message, wParam, lParam, &result);
+ LRESULT result;
+ bool handled = ctx->windowProc(hWnd, message, wParam, lParam, &result);
// TODO: Determine whether to show system menu
// ...
- // Since Qt does the necessary processing of the WM_NCCALCSIZE afterward, we still need to
- // continue dispatching it.
- if (handled && message != WM_NCCALCSIZE) {
+ if (handled) {
return result;
}
+
+ // Continue dispatching.
+ WindowsNativeEventFilter::lastMessageContext = ctx;
return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
}
@@ -884,231 +900,6 @@
}
break;
}
- case WM_NCCALCSIZE: {
- // Windows鏄牴鎹繖涓秷鎭殑杩斿洖鍊兼潵璁剧疆绐楀彛鐨勫鎴峰尯锛堢獥鍙ｄ腑鐪熸鏄剧ず鐨勫唴瀹癸級
- // 鍜岄潪瀹㈡埛鍖猴紙鏍囬鏍忋�佺獥鍙ｈ竟妗嗐�佽彍鍗曟爮鍜岀姸鎬佹爮绛塛indows绯荤粺鑷鎻愪緵鐨勯儴鍒�
- // 锛屼笉杩囧浜嶲t鏉ヨ锛岄櫎浜嗘爣棰樻爮鍜岀獥鍙ｈ竟妗嗭紝闈炲鎴峰尯鍩烘湰涔熼兘鏄嚜缁樼殑锛夌殑鑼�
- // 鍥寸殑锛宭Param閲屽瓨鏀剧殑灏辨槸鏂板鎴峰尯鐨勫嚑浣曞尯鍩燂紝榛樿鏄暣涓獥鍙ｇ殑澶у皬锛屾甯�
- // 鐨勭▼搴忛渶瑕佷慨鏀硅繖涓弬鏁帮紝鍛婄煡绯荤粺绐楀彛鐨勫鎴峰尯鍜岄潪瀹㈡埛鍖虹殑鑼冨洿锛堜竴鑸潵璇村彲
- // 浠ュ畬鍏ㄤ氦缁橶indows锛岃鍏惰嚜琛屽鐞嗭紝浣跨敤榛樿鐨勫鎴峰尯鍜岄潪瀹㈡埛鍖猴級锛屽洜姝ゅ鏋�
- // 鎴戜滑涓嶄慨鏀筶Param锛屽氨鍙互浣垮鎴峰尯鍏呮弧鏁翠釜绐楀彛锛屼粠鑰屽幓鎺夋爣棰樻爮鍜岀獥鍙ｈ竟妗�
- // 锛堝洜涓鸿繖浜涗笢瑗块兘琚鎴峰尯缁欑洊浣忎簡銆備絾杈规闃村奖涔熶細鍥犳鑰屼涪澶憋紝涓嶈繃鎴戜滑浼氫娇
- // 鐢ㄥ叾浠栨柟寮忓皢鍏跺甫鍥烇紝璇峰弬鑰冨叾浠栨秷鎭殑澶勭悊锛屾澶勪笉杩囧鎻愬強锛夈�備絾鏈変釜鎯呭喌瑕�
- // 鐗瑰埆娉ㄦ剰锛岄偅灏辨槸绐楀彛鏈�澶у寲鍚庯紝绐楀彛鐨勫疄闄呭昂瀵镐細姣斿睆骞曠殑灏哄澶т竴鐐癸紝浠庤�屼娇
- // 鐢ㄦ埛鐪嬩笉鍒扮獥鍙ｇ殑杈圭晫锛岃繖鏍风敤鎴峰氨涓嶈兘鍦ㄧ獥鍙ｆ渶澶у寲鍚庤皟鏁寸獥鍙ｇ殑澶у皬浜嗭紙铏界劧
- // 杩欎釜鍋氭硶鍚捣鏉ョ壒鍒鎬紝浣哤indows纭疄灏辨槸杩欐牱鍋氱殑锛夛紝鍥犳濡傛灉鎴戜滑瑕佽嚜琛�
- // 澶勭悊绐楀彛鐨勯潪瀹㈡埛鍖猴紝灏辫鍦ㄧ獥鍙ｆ渶澶у寲鍚庯紝灏嗙獥鍙ｈ竟妗嗙殑瀹藉害鍜岄珮搴︼紙涓�鑸槸鐩�
- // 绛夌殑锛変粠瀹㈡埛鍖鸿鍓帀锛屽惁鍒欐垜浠獥鍙ｆ墍鏄剧ず鐨勫唴瀹瑰氨浼氳秴鍑哄睆骞曡竟鐣岋紝鏄剧ず涓嶅叏銆�
- // 濡傛灉鐢ㄦ埛寮�鍚簡浠诲姟鏍忚嚜鍔ㄩ殣钘忥紝鍦ㄧ獥鍙ｆ渶澶у寲鍚庯紝杩樿鑰冭檻浠诲姟鏍忕殑浣嶇疆銆傚洜涓�
- // 濡傛灉绐楀彛鏈�澶у寲鍚庯紝鍏跺昂瀵稿拰灞忓箷灏哄鐩哥瓑锛堝洜涓轰换鍔℃爮闅愯棌浜嗭紝鎵�浠ョ獥鍙ｆ渶澶у寲
- // 鍚庡叾瀹炴槸鍏呮弧浜嗘暣涓睆骞曪紝鍙樼浉鐨勫叏灞忎簡锛夛紝Windows浼氳涓虹獥鍙ｅ凡缁忚繘鍏ュ叏灞忕殑
- // 鐘舵�侊紝浠庤�屽鑷磋嚜鍔ㄩ殣钘忕殑浠诲姟鏍忔棤娉曞脊鍑恒�傝閬垮厤杩欎釜鐘跺喌锛屽氨瑕佷娇绐楀彛鐨勫昂瀵�
- // 灏忎簬灞忓箷灏哄銆傛垜涓嬮潰鐨勫仛娉曞弬鑰冧簡鐏嫄銆丆hromium鍜學indows Terminal
- // 濡傛灉娌℃湁寮�鍚换鍔℃爮鑷姩闅愯棌锛屾槸涓嶅瓨鍦ㄨ繖涓棶棰樼殑锛屾墍浠ヨ鍏堣繘琛屽垽鏂��
- // 涓�鑸儏鍐典笅锛�*result璁剧疆涓�0锛堢浉褰撲簬DefWindowProc鐨勮繑鍥炲�间负0锛夊氨鍙互浜嗭紝
- // 鏍规嵁MSDN鐨勮娉曪紝杩斿洖0鎰忎负姝ゆ秷鎭凡缁忚绋嬪簭鑷澶勭悊浜嗭紝璁￤indows璺宠繃姝ゆ秷
- // 鎭紝鍚﹀垯Windows浼氭坊鍔犲姝ゆ秷鎭殑榛樿澶勭悊锛屽浜庡綋鍓嶈繖涓秷鎭�岃█锛屽氨鎰忓懗鐫�
- // 鏍囬鏍忓拰绐楀彛杈规鍙堜細鍥炴潵锛岃繖褰撶劧涓嶆槸鎴戜滑鎯宠鐨勭粨鏋溿�傛牴鎹甅SDN锛屽綋wParam
- // 涓篎ALSE鏃讹紝鍙兘杩斿洖0锛屼絾褰撳叾涓篢RUE鏃讹紝鍙互杩斿洖0锛屼篃鍙互杩斿洖涓�涓猈VR_甯�
- // 閲忋�傛牴鎹瓹hromium鐨勬敞閲婏紝褰撳瓨鍦ㄩ潪瀹㈡埛鍖烘椂锛屽鏋滆繑鍥濿VR_REDRAW浼氬鑷村瓙
- // 绐楀彛/瀛愭帶浠跺嚭鐜板鎬殑bug锛堣嚜缁樻帶浠堕敊浣嶏級锛屽苟涓擫ucas鍦╓indows 10
- // 涓婃垚鍔熷鐜帮紝璇存槑杩欎釜bug鑷充粖閮芥病鏈夎В鍐炽�傛垜鏌ラ槄浜嗗ぇ閲忚祫鏂欙紝鍙戠幇鍞竴鐨勮В鍐�
- // 鏂规灏辨槸杩斿洖0銆備絾濡傛灉涓嶅瓨鍦ㄩ潪瀹㈡埛鍖猴紝涓攚Param涓篢RUE锛屾渶濂借繑鍥�
- // WVR_REDRAW锛屽惁鍒欑獥鍙ｅ湪璋冩暣澶у皬鍙兘浼氫骇鐢熶弗閲嶇殑闂儊鐜拌薄銆�
- // 铏界劧瀵瑰ぇ澶氭暟娑堟伅鏉ヨ锛岃繑鍥�0閮戒唬琛ㄨWindows蹇界暐姝ゆ秷鎭紝浣嗗疄闄呬笂涓嶅悓娑堟伅
- // 鑳芥帴鍙楃殑杩斿洖鍊兼槸涓嶄竴鏍风殑锛岃娉ㄦ剰鑷鏌ラ槄MSDN銆�
-
- // Sent when the size and position of a window's client area must be
- // calculated. By processing this message, an application can
- // control the content of the window's client area when the size or
- // position of the window changes. If wParam is TRUE, lParam points
- // to an NCCALCSIZE_PARAMS structure that contains information an
- // application can use to calculate the new size and position of the
- // client rectangle. If wParam is FALSE, lParam points to a RECT
- // structure. On entry, the structure contains the proposed window
- // rectangle for the window. On exit, the structure should contain
- // the screen coordinates of the corresponding window client area.
- // The client area is the window's content area, the non-client area
- // is the area which is provided by the system, such as the title
- // bar, the four window borders, the frame shadow, the menu bar, the
- // status bar, the scroll bar, etc. But for Qt, it draws most of the
- // window area (client + non-client) itself. We now know that the
- // title bar and the window frame is in the non-client area, and we
- // can set the scope of the client area in this message, so we can
- // remove the title bar and the window frame by let the non-client
- // area be covered by the client area (because we can't really get
- // rid of the non-client area, it will always be there, all we can
- // do is to hide it) , which means we should let the client area's
- // size the same with the whole window's size. So there is no room
- // for the non-client area and then the user won't be able to see it
- // again. But how to achieve this? Very easy, just leave lParam (the
- // re-calculated client area) untouched. But of course you can
- // modify lParam, then the non-client area will be seen and the
- // window borders and the window frame will show up. However, things
- // are quite different when you try to modify the top margin of the
- // client area. DWM will always draw the whole title bar no matter
- // what margin value you set for the top, unless you don't modify it
- // and remove the whole top area (the title bar + the one pixel
- // height window border). This can be confirmed in Windows
- // Terminal's source code, you can also try yourself to verify
- // it. So things will become quite complicated if you want to
- // preserve the four window borders.
-
- // If `wParam` is `FALSE`, `lParam` points to a `RECT` that contains
- // the proposed window rectangle for our window. During our
- // processing of the `WM_NCCALCSIZE` message, we are expected to
- // modify the `RECT` that `lParam` points to, so that its value upon
- // our return is the new client area. We must return 0 if `wParam`
- // is `FALSE`.
- // If `wParam` is `TRUE`, `lParam` points to a `NCCALCSIZE_PARAMS`
- // struct. This struct contains an array of 3 `RECT`s, the first of
- // which has the exact same meaning as the `RECT` that is pointed to
- // by `lParam` when `wParam` is `FALSE`. The remaining `RECT`s, in
- // conjunction with our return value, can
- // be used to specify portions of the source and destination window
- // rectangles that are valid and should be preserved. We opt not to
- // implement an elaborate client-area preservation technique, and
- // simply return 0, which means "preserve the entire old client area
- // and align it with the upper-left corner of our new client area".
- const auto clientRect =
- wParam ? &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]
- : reinterpret_cast<LPRECT>(lParam);
- if (isWin10OrGreater()) {
- // Store the original top margin before the default window procedure applies the
- // default frame.
- const LONG originalTop = clientRect->top;
- // Apply the default frame because we don't want to remove the whole window
- // frame, we still need the standard window frame (the resizable frame border
- // and the frame shadow) for the left, bottom and right edges. If we return 0
- // here directly, the whole window frame will be removed (which means there will
- // be no resizable frame border and the frame shadow will also disappear), and
- // that's also how most applications customize their title bars on Windows. It's
- // totally OK but since we want to preserve as much original frame as possible,
- // we can't use that solution.
- const LRESULT hitTestResult =
- ::DefWindowProcW(hWnd, WM_NCCALCSIZE, wParam, lParam);
- if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) {
- *result = hitTestResult;
- return true;
- }
- // Re-apply the original top from before the size of the default frame was
- // applied, and the whole top frame (the title bar and the top border) is gone
- // now. For the top frame, we only has 2 choices: (1) remove the top frame
- // entirely, or (2) don't touch it at all. We can't preserve the top border by
- // adjusting the top margin here. If we try to modify the top margin, the
- // original title bar will always be painted by DWM regardless what margin we
- // set, so here we can only remove the top frame entirely and use some special
- // technique to bring the top border back.
- clientRect->top = originalTop;
- }
- const bool max = IsMaximized(hWnd);
- const bool full = isFullScreen(hWnd);
- // 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
- // borders, and the default frame will be fine.
- if (max && !full) {
- // When a window is maximized, its size is actually a little bit more
- // than the monitor's work area. The window is positioned and sized in
- // such a way that the resize handles are outside the monitor and
- // then the window is clipped to the monitor so that the resize handle
- // do not appear because you don't need them (because you can't resize
- // a window when it's maximized unless you restore it).
- const quint32 frameSize = getResizeBorderThickness(hWnd);
- clientRect->top += frameSize;
- if (!isWin10OrGreater()) {
- clientRect->bottom -= frameSize;
- clientRect->left += frameSize;
- clientRect->right -= frameSize;
- }
- }
- // Attempt to detect if there's an autohide taskbar, and if
- // there is, reduce our size a bit on the side with the taskbar,
- // so the user can still mouse-over the taskbar to reveal it.
- // Make sure to use MONITOR_DEFAULTTONEAREST, so that this will
- // still find the right monitor even when we're restoring from
- // minimized.
- if (max || full) {
- APPBARDATA abd{};
- abd.cbSize = sizeof(abd);
- const UINT taskbarState = ::SHAppBarMessage(ABM_GETSTATE, &abd);
- // First, check if we have an auto-hide taskbar at all:
- if (taskbarState & ABS_AUTOHIDE) {
- bool top = false, bottom = false, left = false, right = false;
- // Due to ABM_GETAUTOHIDEBAREX was introduced in Windows 8.1,
- // we have to use another way to judge this if we are running
- // on Windows 7 or Windows 8.
- if (isWin8Point1OrGreater()) {
- const RECT monitorRect = getMonitorForWindow(hWnd).rcMonitor;
- // This helper can be used to determine if there's an
- // auto-hide taskbar on the given edge of the monitor
- // we're currently on.
- const auto hasAutohideTaskbar = [monitorRect](const UINT edge) -> bool {
- APPBARDATA abd2{};
- abd2.cbSize = sizeof(abd2);
- abd2.uEdge = edge;
- abd2.rc = monitorRect;
- const auto hTaskbar = reinterpret_cast<HWND>(
- ::SHAppBarMessage(ABM_GETAUTOHIDEBAREX, &abd2));
- return (hTaskbar != nullptr);
- };
- top = hasAutohideTaskbar(ABE_TOP);
- bottom = hasAutohideTaskbar(ABE_BOTTOM);
- left = hasAutohideTaskbar(ABE_LEFT);
- right = hasAutohideTaskbar(ABE_RIGHT);
- } else {
- int edge = -1;
- APPBARDATA abd2{};
- abd2.cbSize = sizeof(abd2);
- abd2.hWnd = ::FindWindowW(L"Shell_TrayWnd", nullptr);
- HMONITOR windowMonitor =
- ::MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
- HMONITOR taskbarMonitor =
- ::MonitorFromWindow(abd2.hWnd, MONITOR_DEFAULTTOPRIMARY);
- if (taskbarMonitor == windowMonitor) {
- ::SHAppBarMessage(ABM_GETTASKBARPOS, &abd2);
- edge = int(abd2.uEdge);
- }
- top = (edge == ABE_TOP);
- bottom = (edge == ABE_BOTTOM);
- left = (edge == ABE_LEFT);
- right = (edge == ABE_RIGHT);
- }
- // If there's a taskbar on any side of the monitor, reduce
- // our size a little bit on that edge.
- // Note to future code archeologists:
- // This doesn't seem to work for fullscreen on the primary
- // display. However, testing a bunch of other apps with
- // fullscreen modes and an auto-hiding taskbar has
- // shown that _none_ of them reveal the taskbar from
- // fullscreen mode. This includes Edge, Firefox, Chrome,
- // Sublime Text, PowerPoint - none seemed to support this.
- // This does however work fine for maximized.
- if (top) {
- // Peculiarly, when we're fullscreen,
- clientRect->top += kAutoHideTaskBarThickness;
- } else if (bottom) {
- clientRect->bottom -= kAutoHideTaskBarThickness;
- } else if (left) {
- clientRect->left += kAutoHideTaskBarThickness;
- } else if (right) {
- clientRect->right -= kAutoHideTaskBarThickness;
- }
- }
- }
- // ### TODO: std::ignore = Utils::syncWmPaintWithDwm(); // This should be executed
- // at the very last. By returning WVR_REDRAW we can make the window resizing look
- // less broken. But we must return 0 if wParam is FALSE, according to Microsoft
- // Docs.
- // **IMPORTANT NOTE**:
- // If you are drawing something manually through D3D in your window, don't
- // try to return WVR_REDRAW here, otherwise Windows exhibits bugs where
- // client pixels and child windows are mispositioned by the width/height
- // of the upper-left non-client area. It's confirmed that this issue exists
- // from Windows 7 to Windows 10. Not tested on Windows 11 yet. Don't know
- // whether it exists on Windows XP to Windows Vista or not.
- *result = wParam ? WVR_REDRAW : FALSE;
- return true;
- }
case WM_NCHITTEST: {
// 鍘熺敓Win32绐楀彛鍙湁椤惰竟鏄湪绐楀彛鍐呴儴resize鐨勶紝鍏朵綑涓夎竟閮芥槸鍦ㄧ獥鍙�
// 澶栭儴杩涜resize鐨勶紝鍏跺師鐞嗘槸锛學S_THICKFRAME杩欎釜绐楀彛鏍峰紡浼氬湪绐�
@@ -1453,4 +1244,230 @@
return false;
}
+ bool Win32WindowContext::nonClientCalcSizeHandler(HWND hWnd, UINT message, WPARAM wParam,
+ LPARAM lParam, LRESULT *result) {
+ Q_UNUSED(message)
+
+ // Windows鏄牴鎹繖涓秷鎭殑杩斿洖鍊兼潵璁剧疆绐楀彛鐨勫鎴峰尯锛堢獥鍙ｄ腑鐪熸鏄剧ず鐨勫唴瀹癸級
+ // 鍜岄潪瀹㈡埛鍖猴紙鏍囬鏍忋�佺獥鍙ｈ竟妗嗐�佽彍鍗曟爮鍜岀姸鎬佹爮绛塛indows绯荤粺鑷鎻愪緵鐨勯儴鍒�
+ // 锛屼笉杩囧浜嶲t鏉ヨ锛岄櫎浜嗘爣棰樻爮鍜岀獥鍙ｈ竟妗嗭紝闈炲鎴峰尯鍩烘湰涔熼兘鏄嚜缁樼殑锛夌殑鑼�
+ // 鍥寸殑锛宭Param閲屽瓨鏀剧殑灏辨槸鏂板鎴峰尯鐨勫嚑浣曞尯鍩燂紝榛樿鏄暣涓獥鍙ｇ殑澶у皬锛屾甯�
+ // 鐨勭▼搴忛渶瑕佷慨鏀硅繖涓弬鏁帮紝鍛婄煡绯荤粺绐楀彛鐨勫鎴峰尯鍜岄潪瀹㈡埛鍖虹殑鑼冨洿锛堜竴鑸潵璇村彲
+ // 浠ュ畬鍏ㄤ氦缁橶indows锛岃鍏惰嚜琛屽鐞嗭紝浣跨敤榛樿鐨勫鎴峰尯鍜岄潪瀹㈡埛鍖猴級锛屽洜姝ゅ鏋�
+ // 鎴戜滑涓嶄慨鏀筶Param锛屽氨鍙互浣垮鎴峰尯鍏呮弧鏁翠釜绐楀彛锛屼粠鑰屽幓鎺夋爣棰樻爮鍜岀獥鍙ｈ竟妗�
+ // 锛堝洜涓鸿繖浜涗笢瑗块兘琚鎴峰尯缁欑洊浣忎簡銆備絾杈规闃村奖涔熶細鍥犳鑰屼涪澶憋紝涓嶈繃鎴戜滑浼氫娇
+ // 鐢ㄥ叾浠栨柟寮忓皢鍏跺甫鍥烇紝璇峰弬鑰冨叾浠栨秷鎭殑澶勭悊锛屾澶勪笉杩囧鎻愬強锛夈�備絾鏈変釜鎯呭喌瑕�
+ // 鐗瑰埆娉ㄦ剰锛岄偅灏辨槸绐楀彛鏈�澶у寲鍚庯紝绐楀彛鐨勫疄闄呭昂瀵镐細姣斿睆骞曠殑灏哄澶т竴鐐癸紝浠庤�屼娇
+ // 鐢ㄦ埛鐪嬩笉鍒扮獥鍙ｇ殑杈圭晫锛岃繖鏍风敤鎴峰氨涓嶈兘鍦ㄧ獥鍙ｆ渶澶у寲鍚庤皟鏁寸獥鍙ｇ殑澶у皬浜嗭紙铏界劧
+ // 杩欎釜鍋氭硶鍚捣鏉ョ壒鍒鎬紝浣哤indows纭疄灏辨槸杩欐牱鍋氱殑锛夛紝鍥犳濡傛灉鎴戜滑瑕佽嚜琛�
+ // 澶勭悊绐楀彛鐨勯潪瀹㈡埛鍖猴紝灏辫鍦ㄧ獥鍙ｆ渶澶у寲鍚庯紝灏嗙獥鍙ｈ竟妗嗙殑瀹藉害鍜岄珮搴︼紙涓�鑸槸鐩�
+ // 绛夌殑锛変粠瀹㈡埛鍖鸿鍓帀锛屽惁鍒欐垜浠獥鍙ｆ墍鏄剧ず鐨勫唴瀹瑰氨浼氳秴鍑哄睆骞曡竟鐣岋紝鏄剧ず涓嶅叏銆�
+ // 濡傛灉鐢ㄦ埛寮�鍚簡浠诲姟鏍忚嚜鍔ㄩ殣钘忥紝鍦ㄧ獥鍙ｆ渶澶у寲鍚庯紝杩樿鑰冭檻浠诲姟鏍忕殑浣嶇疆銆傚洜涓�
+ // 濡傛灉绐楀彛鏈�澶у寲鍚庯紝鍏跺昂瀵稿拰灞忓箷灏哄鐩哥瓑锛堝洜涓轰换鍔℃爮闅愯棌浜嗭紝鎵�浠ョ獥鍙ｆ渶澶у寲
+ // 鍚庡叾瀹炴槸鍏呮弧浜嗘暣涓睆骞曪紝鍙樼浉鐨勫叏灞忎簡锛夛紝Windows浼氳涓虹獥鍙ｅ凡缁忚繘鍏ュ叏灞忕殑
+ // 鐘舵�侊紝浠庤�屽鑷磋嚜鍔ㄩ殣钘忕殑浠诲姟鏍忔棤娉曞脊鍑恒�傝閬垮厤杩欎釜鐘跺喌锛屽氨瑕佷娇绐楀彛鐨勫昂瀵�
+ // 灏忎簬灞忓箷灏哄銆傛垜涓嬮潰鐨勫仛娉曞弬鑰冧簡鐏嫄銆丆hromium鍜學indows Terminal
+ // 濡傛灉娌℃湁寮�鍚换鍔℃爮鑷姩闅愯棌锛屾槸涓嶅瓨鍦ㄨ繖涓棶棰樼殑锛屾墍浠ヨ鍏堣繘琛屽垽鏂��
+ // 涓�鑸儏鍐典笅锛�*result璁剧疆涓�0锛堢浉褰撲簬DefWindowProc鐨勮繑鍥炲�间负0锛夊氨鍙互浜嗭紝
+ // 鏍规嵁MSDN鐨勮娉曪紝杩斿洖0鎰忎负姝ゆ秷鎭凡缁忚绋嬪簭鑷澶勭悊浜嗭紝璁￤indows璺宠繃姝ゆ秷
+ // 鎭紝鍚﹀垯Windows浼氭坊鍔犲姝ゆ秷鎭殑榛樿澶勭悊锛屽浜庡綋鍓嶈繖涓秷鎭�岃█锛屽氨鎰忓懗鐫�
+ // 鏍囬鏍忓拰绐楀彛杈规鍙堜細鍥炴潵锛岃繖褰撶劧涓嶆槸鎴戜滑鎯宠鐨勭粨鏋溿�傛牴鎹甅SDN锛屽綋wParam
+ // 涓篎ALSE鏃讹紝鍙兘杩斿洖0锛屼絾褰撳叾涓篢RUE鏃讹紝鍙互杩斿洖0锛屼篃鍙互杩斿洖涓�涓猈VR_甯�
+ // 閲忋�傛牴鎹瓹hromium鐨勬敞閲婏紝褰撳瓨鍦ㄩ潪瀹㈡埛鍖烘椂锛屽鏋滆繑鍥濿VR_REDRAW浼氬鑷村瓙
+ // 绐楀彛/瀛愭帶浠跺嚭鐜板鎬殑bug锛堣嚜缁樻帶浠堕敊浣嶏級锛屽苟涓擫ucas鍦╓indows 10
+ // 涓婃垚鍔熷鐜帮紝璇存槑杩欎釜bug鑷充粖閮芥病鏈夎В鍐炽�傛垜鏌ラ槄浜嗗ぇ閲忚祫鏂欙紝鍙戠幇鍞竴鐨勮В鍐�
+ // 鏂规灏辨槸杩斿洖0銆備絾濡傛灉涓嶅瓨鍦ㄩ潪瀹㈡埛鍖猴紝涓攚Param涓篢RUE锛屾渶濂借繑鍥�
+ // WVR_REDRAW锛屽惁鍒欑獥鍙ｅ湪璋冩暣澶у皬鍙兘浼氫骇鐢熶弗閲嶇殑闂儊鐜拌薄銆�
+ // 铏界劧瀵瑰ぇ澶氭暟娑堟伅鏉ヨ锛岃繑鍥�0閮戒唬琛ㄨWindows蹇界暐姝ゆ秷鎭紝浣嗗疄闄呬笂涓嶅悓娑堟伅
+ // 鑳芥帴鍙楃殑杩斿洖鍊兼槸涓嶄竴鏍风殑锛岃娉ㄦ剰鑷鏌ラ槄MSDN銆�
+
+ // Sent when the size and position of a window's client area must be
+ // calculated. By processing this message, an application can
+ // control the content of the window's client area when the size or
+ // position of the window changes. If wParam is TRUE, lParam points
+ // to an NCCALCSIZE_PARAMS structure that contains information an
+ // application can use to calculate the new size and position of the
+ // client rectangle. If wParam is FALSE, lParam points to a RECT
+ // structure. On entry, the structure contains the proposed window
+ // rectangle for the window. On exit, the structure should contain
+ // the screen coordinates of the corresponding window client area.
+ // The client area is the window's content area, the non-client area
+ // is the area which is provided by the system, such as the title
+ // bar, the four window borders, the frame shadow, the menu bar, the
+ // status bar, the scroll bar, etc. But for Qt, it draws most of the
+ // window area (client + non-client) itself. We now know that the
+ // title bar and the window frame is in the non-client area, and we
+ // can set the scope of the client area in this message, so we can
+ // remove the title bar and the window frame by let the non-client
+ // area be covered by the client area (because we can't really get
+ // rid of the non-client area, it will always be there, all we can
+ // do is to hide it) , which means we should let the client area's
+ // size the same with the whole window's size. So there is no room
+ // for the non-client area and then the user won't be able to see it
+ // again. But how to achieve this? Very easy, just leave lParam (the
+ // re-calculated client area) untouched. But of course you can
+ // modify lParam, then the non-client area will be seen and the
+ // window borders and the window frame will show up. However, things
+ // are quite different when you try to modify the top margin of the
+ // client area. DWM will always draw the whole title bar no matter
+ // what margin value you set for the top, unless you don't modify it
+ // and remove the whole top area (the title bar + the one pixel
+ // height window border). This can be confirmed in Windows
+ // Terminal's source code, you can also try yourself to verify
+ // it. So things will become quite complicated if you want to
+ // preserve the four window borders.
+
+ // If `wParam` is `FALSE`, `lParam` points to a `RECT` that contains
+ // the proposed window rectangle for our window. During our
+ // processing of the `WM_NCCALCSIZE` message, we are expected to
+ // modify the `RECT` that `lParam` points to, so that its value upon
+ // our return is the new client area. We must return 0 if `wParam`
+ // is `FALSE`.
+ // If `wParam` is `TRUE`, `lParam` points to a `NCCALCSIZE_PARAMS`
+ // struct. This struct contains an array of 3 `RECT`s, the first of
+ // which has the exact same meaning as the `RECT` that is pointed to
+ // by `lParam` when `wParam` is `FALSE`. The remaining `RECT`s, in
+ // conjunction with our return value, can
+ // be used to specify portions of the source and destination window
+ // rectangles that are valid and should be preserved. We opt not to
+ // implement an elaborate client-area preservation technique, and
+ // simply return 0, which means "preserve the entire old client area
+ // and align it with the upper-left corner of our new client area".
+ const auto clientRect = wParam ? &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]
+ : reinterpret_cast<LPRECT>(lParam);
+ if (isWin10OrGreater()) {
+ // Store the original top margin before the default window procedure applies the
+ // default frame.
+ const LONG originalTop = clientRect->top;
+ // Apply the default frame because we don't want to remove the whole window
+ // frame, we still need the standard window frame (the resizable frame border
+ // and the frame shadow) for the left, bottom and right edges. If we return 0
+ // here directly, the whole window frame will be removed (which means there will
+ // be no resizable frame border and the frame shadow will also disappear), and
+ // that's also how most applications customize their title bars on Windows. It's
+ // totally OK but since we want to preserve as much original frame as possible,
+ // we can't use that solution.
+ const LRESULT hitTestResult = ::DefWindowProcW(hWnd, WM_NCCALCSIZE, wParam, lParam);
+ if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) {
+ *result = hitTestResult;
+ return true;
+ }
+ // Re-apply the original top from before the size of the default frame was
+ // applied, and the whole top frame (the title bar and the top border) is gone
+ // now. For the top frame, we only has 2 choices: (1) remove the top frame
+ // entirely, or (2) don't touch it at all. We can't preserve the top border by
+ // adjusting the top margin here. If we try to modify the top margin, the
+ // original title bar will always be painted by DWM regardless what margin we
+ // set, so here we can only remove the top frame entirely and use some special
+ // technique to bring the top border back.
+ clientRect->top = originalTop;
+ }
+ const bool max = IsMaximized(hWnd);
+ const bool full = isFullScreen(hWnd);
+ // 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
+ // borders, and the default frame will be fine.
+ if (max && !full) {
+ // When a window is maximized, its size is actually a little bit more
+ // than the monitor's work area. The window is positioned and sized in
+ // such a way that the resize handles are outside the monitor and
+ // then the window is clipped to the monitor so that the resize handle
+ // do not appear because you don't need them (because you can't resize
+ // a window when it's maximized unless you restore it).
+ const quint32 frameSize = getResizeBorderThickness(hWnd);
+ clientRect->top += frameSize;
+ if (!isWin10OrGreater()) {
+ clientRect->bottom -= frameSize;
+ clientRect->left += frameSize;
+ clientRect->right -= frameSize;
+ }
+ }
+ // Attempt to detect if there's an autohide taskbar, and if
+ // there is, reduce our size a bit on the side with the taskbar,
+ // so the user can still mouse-over the taskbar to reveal it.
+ // Make sure to use MONITOR_DEFAULTTONEAREST, so that this will
+ // still find the right monitor even when we're restoring from
+ // minimized.
+ if (max || full) {
+ APPBARDATA abd{};
+ abd.cbSize = sizeof(abd);
+ const UINT taskbarState = ::SHAppBarMessage(ABM_GETSTATE, &abd);
+ // First, check if we have an auto-hide taskbar at all:
+ if (taskbarState & ABS_AUTOHIDE) {
+ bool top = false, bottom = false, left = false, right = false;
+ // Due to ABM_GETAUTOHIDEBAREX was introduced in Windows 8.1,
+ // we have to use another way to judge this if we are running
+ // on Windows 7 or Windows 8.
+ if (isWin8Point1OrGreater()) {
+ const RECT monitorRect = getMonitorForWindow(hWnd).rcMonitor;
+ // This helper can be used to determine if there's an
+ // auto-hide taskbar on the given edge of the monitor
+ // we're currently on.
+ const auto hasAutohideTaskbar = [monitorRect](const UINT edge) -> bool {
+ APPBARDATA abd2{};
+ abd2.cbSize = sizeof(abd2);
+ abd2.uEdge = edge;
+ abd2.rc = monitorRect;
+ const auto hTaskbar =
+ reinterpret_cast<HWND>(::SHAppBarMessage(ABM_GETAUTOHIDEBAREX, &abd2));
+ return (hTaskbar != nullptr);
+ };
+ top = hasAutohideTaskbar(ABE_TOP);
+ bottom = hasAutohideTaskbar(ABE_BOTTOM);
+ left = hasAutohideTaskbar(ABE_LEFT);
+ right = hasAutohideTaskbar(ABE_RIGHT);
+ } else {
+ int edge = -1;
+ APPBARDATA abd2{};
+ abd2.cbSize = sizeof(abd2);
+ abd2.hWnd = ::FindWindowW(L"Shell_TrayWnd", nullptr);
+ HMONITOR windowMonitor = ::MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+ HMONITOR taskbarMonitor =
+ ::MonitorFromWindow(abd2.hWnd, MONITOR_DEFAULTTOPRIMARY);
+ if (taskbarMonitor == windowMonitor) {
+ ::SHAppBarMessage(ABM_GETTASKBARPOS, &abd2);
+ edge = int(abd2.uEdge);
+ }
+ top = (edge == ABE_TOP);
+ bottom = (edge == ABE_BOTTOM);
+ left = (edge == ABE_LEFT);
+ right = (edge == ABE_RIGHT);
+ }
+ // If there's a taskbar on any side of the monitor, reduce
+ // our size a little bit on that edge.
+ // Note to future code archeologists:
+ // This doesn't seem to work for fullscreen on the primary
+ // display. However, testing a bunch of other apps with
+ // fullscreen modes and an auto-hiding taskbar has
+ // shown that _none_ of them reveal the taskbar from
+ // fullscreen mode. This includes Edge, Firefox, Chrome,
+ // Sublime Text, PowerPoint - none seemed to support this.
+ // This does however work fine for maximized.
+ if (top) {
+ // Peculiarly, when we're fullscreen,
+ clientRect->top += kAutoHideTaskBarThickness;
+ } else if (bottom) {
+ clientRect->bottom -= kAutoHideTaskBarThickness;
+ } else if (left) {
+ clientRect->left += kAutoHideTaskBarThickness;
+ } else if (right) {
+ clientRect->right -= kAutoHideTaskBarThickness;
+ }
+ }
+ }
+ // ### TODO: std::ignore = Utils::syncWmPaintWithDwm(); // This should be executed
+ // at the very last. By returning WVR_REDRAW we can make the window resizing look
+ // less broken. But we must return 0 if wParam is FALSE, according to Microsoft
+ // Docs.
+ // **IMPORTANT NOTE**:
+ // If you are drawing something manually through D3D in your window, don't
+ // try to return WVR_REDRAW here, otherwise Windows exhibits bugs where
+ // client pixels and child windows are mispositioned by the width/height
+ // of the upper-left non-client area. It's confirmed that this issue exists
+ // from Windows 7 to Windows 10. Not tested on Windows 11 yet. Don't know
+ // whether it exists on Windows XP to Windows Vista or not.
+ *result = wParam ? WVR_REDRAW : FALSE;
+ return true;
+ }
+
}
diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h
index dd506aa..8906a51 100644
--- a/src/core/contexts/win32windowcontext_p.h
+++ b/src/core/contexts/win32windowcontext_p.h
@@ -37,6 +37,9 @@
bool customWindowHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
LRESULT *result);
+ static bool nonClientCalcSizeHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
+ LRESULT *result);
+
protected:
WId windowId = 0;
--
Gitblit v1.9.1