From 9b1599d82e86d2d0463b60fe6fa61f94be50f983 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周二, 05 12月 2023 14:48:52 +0800
Subject: [PATCH] port some more code (for os < win10)
---
src/core/corewindowagent.cpp | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/core/corewindowagent.cpp b/src/core/corewindowagent.cpp
index b705937..78ed335 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,24 @@
void CoreWindowAgentPrivate::init() {
}
- bool CoreWindowAgentPrivate::setup(QWindow *window, const WindowItemDelegatePtr &delegate) {
+ bool CoreWindowAgentPrivate::setup(QWindow *window, WindowItemDelegate *delegate) {
Q_ASSERT(window);
if (!window) {
return false;
}
+
auto handler =
#ifdef Q_OS_WINDOWS
- std::make_shared<Win32WindowContext>(window, delegate)
+ new Win32WindowContext(window, delegate)
#else
- std::make_shared<QtWindowContext>(window, delegate)
+ new QtWindowContext(window, delegate)
#endif
;
-
if (!handler->setup()) {
+ delete handler;
return false;
}
- eventHandler = handler;
+ context.reset(handler);
return true;
}
@@ -43,12 +46,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 +62,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