From 3a5e5aea06e87710e24db0d7439ab81e3e3d301f Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周六, 09 12月 2023 17:24:04 +0800
Subject: [PATCH] fix system menu
---
src/core/corewindowagent.cpp | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/core/corewindowagent.cpp b/src/core/corewindowagent.cpp
index b705937..d5dff5a 100644
--- a/src/core/corewindowagent.cpp
+++ b/src/core/corewindowagent.cpp
@@ -1,6 +1,8 @@
#include "corewindowagent.h"
#include "corewindowagent_p.h"
+#include "qwkcoreglobal_p.h"
+
#ifdef Q_OS_WINDOWS
# include "win32windowcontext_p.h"
#else
@@ -11,7 +13,7 @@
namespace QWK {
- CoreWindowAgentPrivate::CoreWindowAgentPrivate() : q_ptr(nullptr), eventHandler(nullptr) {
+ CoreWindowAgentPrivate::CoreWindowAgentPrivate() : q_ptr(nullptr), context(nullptr) {
}
CoreWindowAgentPrivate::~CoreWindowAgentPrivate() = default;
@@ -19,23 +21,23 @@
void CoreWindowAgentPrivate::init() {
}
- bool CoreWindowAgentPrivate::setup(QWindow *window, const WindowItemDelegatePtr &delegate) {
- Q_ASSERT(window);
- if (!window) {
- return false;
- }
- auto handler =
+ AbstractWindowContext *CoreWindowAgentPrivate::createContext() const {
+ return
#ifdef Q_OS_WINDOWS
- std::make_shared<Win32WindowContext>(window, delegate)
+ new Win32WindowContext()
#else
- std::make_shared<QtWindowContext>(window, delegate)
+ new QtWindowContext()
#endif
- ;
+ ;
+ }
- if (!handler->setup()) {
+
+ bool CoreWindowAgentPrivate::setup(QObject *host, WindowItemDelegate *delegate) {
+ std::unique_ptr<AbstractWindowContext> ctx(createContext());
+ if (!ctx->setup(host, delegate)) {
return false;
}
- eventHandler = handler;
+ context = std::move(ctx);
return true;
}
@@ -43,12 +45,12 @@
void CoreWindowAgent::showSystemMenu(const QPoint &pos) {
Q_D(CoreWindowAgent);
- d->eventHandler->showSystemMenu(pos);
+ d->context->showSystemMenu(pos);
}
void CoreWindowAgent::startSystemMove(const QPoint &pos) {
Q_D(CoreWindowAgent);
- auto win = d->eventHandler->window();
+ auto win = d->context->window();
if (!win) {
return;
}
@@ -59,7 +61,7 @@
void CoreWindowAgent::startSystemResize(Qt::Edges edges, const QPoint &pos) {
Q_D(CoreWindowAgent);
- auto win = d->eventHandler->window();
+ auto win = d->context->window();
if (!win) {
return;
}
--
Gitblit v1.9.1