From 88b5b56b6a67d93208eae3980af2f30da09dd8ae Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 27 12月 2023 01:10:59 +0800
Subject: [PATCH] Add notification observer on Mac
---
src/widgets/widgetwindowagent_win.cpp | 2
src/core/contexts/cocoawindowcontext.mm | 297 +++++++++++++++++++++++++++++++++++-------------
src/quick/quickwindowagent_win.cpp | 2
src/core/contexts/cocoawindowcontext_p.h | 2
src/quick/quickwindowagent_p.h | 2
CMakeLists.txt | 2
src/widgets/widgetwindowagent_p.h | 2
src/core/contexts/qtwindowcontext_p.h | 2
src/core/contexts/win32windowcontext.cpp | 17 +-
src/widgets/widgetwindowagent.cpp | 2
src/CMakeLists.txt | 4
src/core/contexts/qtwindowcontext.cpp | 18 +-
src/quick/quickwindowagent.cpp | 2
13 files changed, 241 insertions(+), 113 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44aabdb..001d00c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@
option(QWINDOWKIT_INSTALL "Install library" ON)
option(QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT "Enable Qt Window Context anyway" OFF)
-option(QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER "Enable system border on Windows" ON)
+option(QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDERS "Enable system borders on Windows" ON)
# ----------------------------------
# CMake Settings
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dddf76a..267b05a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,8 +17,8 @@
qm_add_definition(QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT
CONDITION QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT
)
-qm_add_definition(QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER
- CONDITION QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER
+qm_add_definition(QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDERS
+ CONDITION QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDERS
)
qm_generate_config(${QWINDOWKIT_BUILD_INCLUDE_DIR}/QWKCore/qwkconfig.h)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 949681d..21616d5 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -3,6 +3,8 @@
#include <objc/runtime.h>
#include <AppKit/AppKit.h>
+#include <Cocoa/Cocoa.h>
+
#include <QtGui/QGuiApplication>
#include "qwkglobal_p.h"
@@ -10,76 +12,139 @@
namespace QWK {
- struct NSWindowProxy {
+ struct NSWindowProxy;
+
+ using ProxyList = QHash<WId, NSWindowProxy *>;
+ Q_GLOBAL_STATIC(ProxyList, g_proxyList);
+
+ using ProxyList2 = QHash<NSWindow *, NSWindowProxy *>;
+ Q_GLOBAL_STATIC(ProxyList2, g_proxyIndexes);
+
+}
+
+struct QWK_NSWindowDelegate {
+public:
+ virtual ~QWK_NSWindowDelegate() = default;
+ virtual void windowWillEnterFullScreen(){};
+ virtual void windowDidEnterFullScreen(){};
+ virtual void windowWillExitFullScreen(){};
+ virtual void windowDidExitFullScreen(){};
+ virtual void windowDidResize(){};
+};
+
+//
+// Objective C++ Begin
+//
+
+@interface QWK_NSWindowObserver : NSObject {
+}
+@end
+
+@implementation QWK_NSWindowObserver
+
+- (id)init {
+ self = [super init];
+ if (self) {
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowWillEnterFullScreen:)
+ name:NSWindowWillEnterFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidEnterFullScreen:)
+ name:NSWindowDidEnterFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowWillExitFullScreen:)
+ name:NSWindowWillExitFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidExitFullScreen:)
+ name:NSWindowDidExitFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidResize:)
+ name:NSWindowDidResizeNotification
+ object:nil];
+ }
+ return self;
+}
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowWillEnterFullScreen();
+ }
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidEnterFullScreen();
+ }
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowWillExitFullScreen();
+ }
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidExitFullScreen();
+ }
+}
+
+- (void)windowDidResize:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidResize();
+ }
+}
+
+@end
+
+//
+// Objective C++ End
+//
+
+namespace QWK {
+
+ struct NSWindowProxy : public QWK_NSWindowDelegate {
NSWindowProxy(NSWindow *macWindow) {
- if (instances.contains(macWindow)) {
- return;
- }
nswindow = macWindow;
- instances.insert(macWindow, this);
- if (!windowClass) {
- windowClass = [nswindow class];
- replaceImplementations();
- }
+ g_proxyIndexes->insert(nswindow, this);
}
- ~NSWindowProxy() {
- instances.remove(nswindow);
- if (instances.count() <= 0) {
- restoreImplementations();
- windowClass = nil;
- }
- nswindow = nil;
+ ~NSWindowProxy() override {
+ g_proxyIndexes->remove(nswindow);
}
- void replaceImplementations() {
- Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
- oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(
- method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
-
- method =
- class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
- oldSetTitlebarAppearsTransparent =
- reinterpret_cast<setTitlebarAppearsTransparentPtr>(method_setImplementation(
- method, reinterpret_cast<IMP>(setTitlebarAppearsTransparent)));
-
-#if 0
- method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
- oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
-
- method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
- oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
-#endif
-
- method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
- oldSendEvent = reinterpret_cast<sendEventPtr>(
- method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
+ void windowWillEnterFullScreen() override {
+ qDebug() << "windowWillEnterFullScreen";
}
- void restoreImplementations() {
- Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
- method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
- oldSetStyleMask = nil;
+ void windowDidEnterFullScreen() override {
+ qDebug() << "windowDidEnterFullScreen";
+ }
- method =
- class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
- method_setImplementation(method,
- reinterpret_cast<IMP>(oldSetTitlebarAppearsTransparent));
- oldSetTitlebarAppearsTransparent = nil;
+ void windowWillExitFullScreen() override {
+ qDebug() << "windowWillExitFullScreen";
+ }
-#if 0
- method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
- method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeKeyWindow));
- oldCanBecomeKeyWindow = nil;
+ void windowDidExitFullScreen() override {
+ qDebug() << "windowDidExitFullScreen";
+ }
- method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
- method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeMainWindow));
- oldCanBecomeMainWindow = nil;
-#endif
-
- method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
- method_setImplementation(method, reinterpret_cast<IMP>(oldSendEvent));
- oldSendEvent = nil;
+ void windowDidResize() override {
+ qDebug() << "windowDidResize";
}
void setSystemTitleBarVisible(const bool visible) {
@@ -87,6 +152,7 @@
if (!nsview) {
return;
}
+
nsview.wantsLayer = YES;
nswindow.styleMask |= NSWindowStyleMaskResizable;
if (visible) {
@@ -110,9 +176,66 @@
#endif
}
+ static void replaceImplementations() {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(
+ method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
+
+ method =
+ class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ oldSetTitlebarAppearsTransparent =
+ reinterpret_cast<setTitlebarAppearsTransparentPtr>(method_setImplementation(
+ method, reinterpret_cast<IMP>(setTitlebarAppearsTransparent)));
+
+#if 0
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+ oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
+
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
+#endif
+
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ oldSendEvent = reinterpret_cast<sendEventPtr>(
+ method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
+
+ // Alloc
+ windowObserver = [[QWK_NSWindowObserver alloc] init];
+ }
+
+ static void restoreImplementations() {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
+ oldSetStyleMask = nil;
+
+ method =
+ class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ method_setImplementation(method,
+ reinterpret_cast<IMP>(oldSetTitlebarAppearsTransparent));
+ oldSetTitlebarAppearsTransparent = nil;
+
+#if 0
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeKeyWindow));
+ oldCanBecomeKeyWindow = nil;
+
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeMainWindow));
+ oldCanBecomeMainWindow = nil;
+#endif
+
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldSendEvent));
+ oldSendEvent = nil;
+
+ // Delete
+ [windowObserver release];
+ windowObserver = nil;
+ }
+
private:
static BOOL canBecomeKeyWindow(id obj, SEL sel) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
}
@@ -124,7 +247,7 @@
}
static BOOL canBecomeMainWindow(id obj, SEL sel) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
}
@@ -136,7 +259,7 @@
}
static void setStyleMask(id obj, SEL sel, NSWindowStyleMask styleMask) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
styleMask |= NSWindowStyleMaskFullSizeContentView;
}
@@ -146,7 +269,7 @@
}
static void setTitlebarAppearsTransparent(id obj, SEL sel, BOOL transparent) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
transparent = YES;
}
@@ -176,15 +299,16 @@
#endif
}
+ static inline const Class windowClass = [NSWindow class];
+
private:
Q_DISABLE_COPY(NSWindowProxy)
NSWindow *nswindow = nil;
+
+ static inline QWK_NSWindowObserver *windowObserver = nil;
+
// NSEvent *lastMouseDownEvent = nil;
-
- static inline QHash<NSWindow *, NSWindowProxy *> instances = {};
-
- static inline Class windowClass = nil;
using setStyleMaskPtr = void (*)(id, SEL, NSWindowStyleMask);
static inline setStyleMaskPtr oldSetStyleMask = nil;
@@ -202,34 +326,41 @@
static inline sendEventPtr oldSendEvent = nil;
};
- using ProxyList = QHash<WId, NSWindowProxy *>;
- Q_GLOBAL_STATIC(ProxyList, g_proxyList);
-
static inline NSWindow *mac_getNSWindow(const WId windowId) {
const auto nsview = reinterpret_cast<NSView *>(windowId);
return [nsview window];
}
static inline NSWindowProxy *ensureWindowProxy(const WId windowId) {
- auto it = g_proxyList()->find(windowId);
- if (it == g_proxyList()->end()) {
+ if (g_proxyList->isEmpty()) {
+ NSWindowProxy::replaceImplementations();
+ }
+
+ auto it = g_proxyList->find(windowId);
+ if (it == g_proxyList->end()) {
NSWindow *nswindow = mac_getNSWindow(windowId);
const auto proxy = new NSWindowProxy(nswindow);
- it = g_proxyList()->insert(windowId, proxy);
+ it = g_proxyList->insert(windowId, proxy);
}
return it.value();
}
static inline void releaseWindowProxy(const WId windowId) {
- if (const auto proxy = g_proxyList()->take(windowId)) {
+ if (auto proxy = g_proxyList->take(windowId)) {
proxy->setSystemTitleBarVisible(true);
delete proxy;
+ } else {
+ return;
+ }
+
+ if (g_proxyList->isEmpty()) {
+ NSWindowProxy::restoreImplementations();
}
}
- class CocoaWindowEventFilter : public QObject {
+ class CocoaWindowEventFilter : public SharedEventFilter {
public:
- explicit CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ explicit CocoaWindowEventFilter(AbstractWindowContext *context);
~CocoaWindowEventFilter() override;
enum WindowStatus {
@@ -240,7 +371,7 @@
};
protected:
- bool eventFilter(QObject *object, QEvent *event) override;
+ bool sharedEventFilter(QObject *object, QEvent *event) override;
private:
AbstractWindowContext *m_context;
@@ -248,15 +379,16 @@
WindowStatus m_windowStatus;
};
- CocoaWindowEventFilter::CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent)
- : QObject(parent), m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
- m_context->window()->installEventFilter(this);
+ CocoaWindowEventFilter::CocoaWindowEventFilter(AbstractWindowContext *context)
+ : m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
+ m_context->installSharedEventFilter(this);
}
CocoaWindowEventFilter::~CocoaWindowEventFilter() = default;
- bool CocoaWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ bool CocoaWindowEventFilter::sharedEventFilter(QObject *obj, QEvent *event) {
Q_UNUSED(obj)
+
auto type = event->type();
if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
return false;
@@ -359,6 +491,7 @@
}
CocoaWindowContext::CocoaWindowContext() : AbstractWindowContext() {
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this);
}
CocoaWindowContext::~CocoaWindowContext() {
@@ -387,7 +520,6 @@
if (windowId) {
releaseWindowProxy(windowId);
windowId = 0;
- cocoaWindowEventFilter.reset();
}
if (!m_windowHandle) {
@@ -397,7 +529,6 @@
// Allocate new resources
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
- cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
}
bool CocoaWindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
diff --git a/src/core/contexts/cocoawindowcontext_p.h b/src/core/contexts/cocoawindowcontext_p.h
index ca1c6cb..67c97db 100644
--- a/src/core/contexts/cocoawindowcontext_p.h
+++ b/src/core/contexts/cocoawindowcontext_p.h
@@ -31,7 +31,7 @@
protected:
WId windowId = 0;
- std::unique_ptr<QObject> cocoaWindowEventFilter;
+ std::unique_ptr<SharedEventFilter> cocoaWindowEventFilter;
};
}
diff --git a/src/core/contexts/qtwindowcontext.cpp b/src/core/contexts/qtwindowcontext.cpp
index 9c05fa4..bd7b3e1 100644
--- a/src/core/contexts/qtwindowcontext.cpp
+++ b/src/core/contexts/qtwindowcontext.cpp
@@ -77,9 +77,9 @@
#endif
}
- class QtWindowEventFilter : public QObject {
+ class QtWindowEventFilter : public SharedEventFilter {
public:
- explicit QtWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ explicit QtWindowEventFilter(AbstractWindowContext *context);
~QtWindowEventFilter() override;
enum WindowStatus {
@@ -91,7 +91,7 @@
};
protected:
- bool eventFilter(QObject *object, QEvent *event) override;
+ bool sharedEventFilter(QObject *object, QEvent *event) override;
private:
AbstractWindowContext *m_context;
@@ -99,15 +99,16 @@
WindowStatus m_windowStatus;
};
- QtWindowEventFilter::QtWindowEventFilter(AbstractWindowContext *context, QObject *parent)
- : QObject(parent), m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
- m_context->window()->installEventFilter(this);
+ QtWindowEventFilter::QtWindowEventFilter(AbstractWindowContext *context)
+ : m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
+ m_context->installSharedEventFilter(this);
}
QtWindowEventFilter::~QtWindowEventFilter() = default;
- bool QtWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ bool QtWindowEventFilter::sharedEventFilter(QObject *obj, QEvent *event) {
Q_UNUSED(obj)
+
auto type = event->type();
if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
return false;
@@ -235,6 +236,7 @@
}
QtWindowContext::QtWindowContext() : AbstractWindowContext() {
+ qtWindowEventFilter = std::make_unique<QtWindowEventFilter>(this);
}
QtWindowContext::~QtWindowContext() = default;
@@ -251,14 +253,12 @@
if (!m_windowHandle) {
m_delegate->setWindowFlags(m_host, m_delegate->getWindowFlags(m_host) &
~Qt::FramelessWindowHint);
- qtWindowEventFilter.reset();
return;
}
// Allocate new resources
m_delegate->setWindowFlags(m_host,
m_delegate->getWindowFlags(m_host) | Qt::FramelessWindowHint);
- qtWindowEventFilter = std::make_unique<QtWindowEventFilter>(this);
}
}
diff --git a/src/core/contexts/qtwindowcontext_p.h b/src/core/contexts/qtwindowcontext_p.h
index bb823da..fa9aece 100644
--- a/src/core/contexts/qtwindowcontext_p.h
+++ b/src/core/contexts/qtwindowcontext_p.h
@@ -27,7 +27,7 @@
void winIdChanged() override;
protected:
- std::unique_ptr<QObject> qtWindowEventFilter;
+ std::unique_ptr<SharedEventFilter> qtWindowEventFilter;
};
}
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 84a085d..dfbf2e2 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -46,13 +46,13 @@
static WNDPROC g_qtWindowProc = nullptr;
static inline bool
-#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if !QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
constexpr
#endif
isSystemBorderEnabled() {
return
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
isWin10OrGreater()
#else
false
@@ -401,8 +401,8 @@
return false;
}
- static WindowsNativeEventFilter *instance;
- static Win32WindowContext *lastMessageContext;
+ static inline WindowsNativeEventFilter *instance = nullptr;
+ static inline Win32WindowContext *lastMessageContext = nullptr;
static inline void install() {
if (instance) {
@@ -419,9 +419,6 @@
instance = nullptr;
}
};
-
- 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
@@ -606,7 +603,7 @@
}
case DrawWindows10BorderHook: {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
if (!windowId)
return;
@@ -651,7 +648,7 @@
}
case DrawWindows10BorderHook2: {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
if (!m_windowHandle)
return;
@@ -729,7 +726,7 @@
{
auto style = ::GetWindowLongPtrW(hWnd, GWL_STYLE);
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
::SetWindowLongPtrW(hWnd, GWL_STYLE, style & (~WS_SYSMENU));
#else
::SetWindowLongPtrW(hWnd, GWL_STYLE,
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 100514d..0731836 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -35,7 +35,7 @@
d->setup(window, new QuickItemDelegate());
d->hostWindow = window;
-#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
d->setupWindows10BorderWorkaround();
#endif
return true;
diff --git a/src/quick/quickwindowagent_p.h b/src/quick/quickwindowagent_p.h
index 8919bdb..e63fbfe 100644
--- a/src/quick/quickwindowagent_p.h
+++ b/src/quick/quickwindowagent_p.h
@@ -27,7 +27,7 @@
// Host
QQuickWindow *hostWindow{};
-#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
void setupWindows10BorderWorkaround();
#endif
};
diff --git a/src/quick/quickwindowagent_win.cpp b/src/quick/quickwindowagent_win.cpp
index 46e72e3..61ea0ed 100644
--- a/src/quick/quickwindowagent_win.cpp
+++ b/src/quick/quickwindowagent_win.cpp
@@ -7,7 +7,7 @@
namespace QWK {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
// TODO: Find a way to draw native border
// We haven't found a way to place hooks in the Quick program and call the GDI API to draw
// the native border area so that we'll use the emulated drawn border for now.
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 5422694..d74c5f6 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -39,7 +39,7 @@
d->setup(w, new WidgetItemDelegate());
d->hostWidget = w;
-#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
d->setupWindows10BorderWorkaround();
#endif
return true;
diff --git a/src/widgets/widgetwindowagent_p.h b/src/widgets/widgetwindowagent_p.h
index 64702b1..2f67779 100644
--- a/src/widgets/widgetwindowagent_p.h
+++ b/src/widgets/widgetwindowagent_p.h
@@ -32,7 +32,7 @@
std::unique_ptr<QObject> systemButtonAreaWidgetEventFilter;
#endif
-#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
void setupWindows10BorderWorkaround();
std::unique_ptr<QObject> borderHandler;
#endif
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 386a6cd..7172db5 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -8,7 +8,7 @@
namespace QWK {
-#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowsbackingstore.cpp#L42
// In QtWidgets applications, when repainting happens, QPA at the last calls
// QWindowsBackingStore::flush() to draw the contents of the buffer to the screen, we need to
--
Gitblit v1.9.1