From 00b91a374872280a4a5addc22f08c7954a6637aa Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 15 5月 2024 10:10:51 +0800
Subject: [PATCH] minor tweaks
---
examples/mainwindow/main.cpp | 3 +
src/core/qwindowkit_windows.h | 8 ----
src/core/contexts/win32windowcontext.cpp | 62 +++++++++++++++++-------------
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/examples/mainwindow/main.cpp b/examples/mainwindow/main.cpp
index 4118e80..aeafc29 100644
--- a/examples/mainwindow/main.cpp
+++ b/examples/mainwindow/main.cpp
@@ -19,6 +19,7 @@
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#endif
+ QGuiApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
QApplication a(argc, argv);
#if 0 && defined(Q_OS_WINDOWS) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -38,4 +39,4 @@
w2.show();
#endif
return a.exec();
-}
\ No newline at end of file
+}
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 84c80ef..43d5cb6 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -124,6 +124,36 @@
SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
}
+ static inline bool isFullScreen(HWND hwnd) {
+ RECT windowRect{};
+ ::GetWindowRect(hwnd, &windowRect);
+ // Compare to the full area of the screen, not the work area.
+ return (windowRect == getMonitorForWindow(hwnd).rcMonitor);
+ }
+
+ static inline bool isMaximized(HWND hwnd) {
+ return ::IsZoomed(hwnd);
+ }
+
+ static inline bool isMinimized(HWND hwnd) {
+ return ::IsIconic(hwnd);
+ }
+
+ static inline bool isWindowNoState(HWND hwnd) {
+#if 0
+ WINDOWPLACEMENT wp{};
+ wp.length = sizeof(wp);
+ ::GetWindowPlacement(hwnd, &wp);
+ return ((wp.showCmd == SW_NORMAL) || (wp.showCmd == SW_RESTORE));
+#else
+ if (isFullScreen(hwnd)) {
+ return false;
+ }
+ const auto style = static_cast<DWORD>(::GetWindowLongPtrW(hwnd, GWL_STYLE));
+ return (!(style & (WS_MINIMIZE | WS_MAXIMIZE)));
+#endif
+ }
+
static inline void bringWindowToFront(HWND hwnd) {
HWND oldForegroundWindow = ::GetForegroundWindow();
if (!oldForegroundWindow) {
@@ -135,7 +165,7 @@
if (!::IsWindowVisible(hwnd)) {
::ShowWindow(hwnd, SW_SHOW);
}
- if (IsMinimized(hwnd)) {
+ if (isMinimized(hwnd)) {
// Restore the window if it is minimized.
::ShowWindow(hwnd, SW_RESTORE);
// Once we've been restored, throw us on the active monitor.
@@ -170,28 +200,6 @@
::SetActiveWindow(hwnd);
// Throw us on the active monitor.
moveWindowToMonitor(hwnd, activeMonitor);
- }
-
- static inline bool isFullScreen(HWND hwnd) {
- RECT windowRect{};
- ::GetWindowRect(hwnd, &windowRect);
- // Compare to the full area of the screen, not the work area.
- return (windowRect == getMonitorForWindow(hwnd).rcMonitor);
- }
-
- static inline bool isWindowNoState(HWND hwnd) {
-#if 0
- WINDOWPLACEMENT wp{};
- wp.length = sizeof(wp);
- ::GetWindowPlacement(hwnd, &wp);
- return ((wp.showCmd == SW_NORMAL) || (wp.showCmd == SW_RESTORE));
-#else
- if (isFullScreen(hwnd)) {
- return false;
- }
- const auto style = static_cast<DWORD>(::GetWindowLongPtrW(hwnd, GWL_STYLE));
- return (!(style & (WS_MINIMIZE | WS_MAXIMIZE)));
-#endif
}
static void syncPaintEventWithDwm() {
@@ -250,7 +258,7 @@
return true;
}
- const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
+ const bool maxOrFull = isMaximized(hWnd) || isFullScreen(hWnd);
::EnableMenuItem(hMenu, SC_CLOSE, (MF_BYCOMMAND | MFS_ENABLED));
::EnableMenuItem(hMenu, SC_MAXIMIZE,
(MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
@@ -1646,7 +1654,7 @@
// OK, we are not inside any chrome buttons, try to find out which part of the
// window are we hitting.
- bool max = IsMaximized(hWnd);
+ bool max = isMaximized(hWnd);
bool full = isFullScreen(hWnd);
int frameSize = getResizeBorderThickness(hWnd);
bool isTop = (nativeLocalPos.y < frameSize);
@@ -1958,7 +1966,7 @@
clientRect->top = originalTop;
}
- const bool max = IsMaximized(hWnd);
+ 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
@@ -2073,7 +2081,7 @@
return {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
};
const auto getNativeGlobalPosFromKeyboard = [hWnd]() -> POINT {
- const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
+ const bool maxOrFull = isMaximized(hWnd) || isFullScreen(hWnd);
const quint32 frameSize = getResizeBorderThickness(hWnd);
const quint32 horizontalOffset =
((maxOrFull || !isSystemBorderEnabled()) ? 0 : frameSize);
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index 08dca87..ca7c9c5 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -22,14 +22,6 @@
# define GET_Y_LPARAM(lp) (static_cast<int>(static_cast<short>(HIWORD(lp))))
#endif
-#ifndef IsMinimized
-# define IsMinimized(hwnd) (::IsIconic(hwnd))
-#endif
-
-#ifndef IsMaximized
-# define IsMaximized(hwnd) (::IsZoomed(hwnd))
-#endif
-
#ifndef RECT_WIDTH
# define RECT_WIDTH(rect) ((rect).right - (rect).left)
#endif
--
Gitblit v1.9.1