From 503d6461cde51aefeea73fc956264cbc815e9c14 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周三, 20 12月 2023 19:44:59 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/abstractwindowcontext.cpp | 72 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index d34a1f9..535ffc2 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,6 +2,7 @@
#include <QtGui/QPen>
#include <QtGui/QPainter>
+#include <QtGui/QScreen>
#include "qwkglobal_p.h"
@@ -17,10 +18,22 @@
}
m_host = host;
m_delegate.reset(delegate);
- m_windowHandle = m_delegate->hostWindow(m_host);
- if (m_windowHandle) {
- winIdChanged(nullptr);
- }
+ setEnabled(true);
+ }
+
+ void AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &var) {
+ auto it = m_windowAttributes.find(key);
+ if (it.value() == var)
+ return;
+
+ auto newVar = var;
+ auto oldVar = it.value();
+ void *args[] = {
+ &const_cast<QString &>(key),
+ &newVar,
+ &oldVar,
+ };
+ virtual_hook(WindowAttributeChangedHook, args);
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -139,13 +152,22 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
- // TODO: Qt
- break;
+ QRect screenGeometry = m_windowHandle->screen()->geometry();
+ int x = (screenGeometry.width() - m_windowHandle->width()) / 2;
+ int y = (screenGeometry.height() - m_windowHandle->height()) / 2;
+ QPoint pos(x, y);
+ pos += screenGeometry.topLeft();
+ m_windowHandle->setPosition(pos);
+ return;
}
- case ShowSystemMenuHook: {
- // TODO: Qt
- break;
+ case RaiseWindowHook: {
+ Qt::WindowStates state = m_delegate->getWindowState(m_host);
+ if (state & Qt::WindowMinimized) {
+ m_delegate->setWindowState(m_host, state & ~Qt::WindowMinimized);
+ }
+ m_delegate->bringWindowToTop(m_host);
+ return;
}
case DefaultColorsHook: {
@@ -168,11 +190,39 @@
}
void AbstractWindowContext::notifyWinIdChange() {
+ if (!m_internalEnabled)
+ return;
+
auto oldWindow = m_windowHandle;
- m_windowHandle = m_delegate->window(m_host);
if (oldWindow == m_windowHandle)
return;
- winIdChanged(oldWindow);
+ auto isDestroyed = oldWindow && m_windowHandleCache.isNull();
+ m_windowHandle = m_delegate->window(m_host);
+ m_windowHandleCache = m_windowHandle;
+ winIdChanged(oldWindow, isDestroyed);
+ }
+
+ void AbstractWindowContext::setEnabled(bool enabled) {
+ if (enabled == m_internalEnabled)
+ return;
+ m_internalEnabled = enabled;
+
+ if (enabled) {
+ m_windowHandle = m_delegate->window(m_host);
+ m_windowHandleCache = m_windowHandle;
+ if (m_windowHandle) {
+ winIdChanged(nullptr, false);
+ }
+ return;
+ }
+
+ if (!m_windowHandle)
+ return;
+
+ auto oldWindow = m_windowHandle;
+ m_windowHandle = nullptr;
+ m_windowHandleCache.clear();
+ winIdChanged(oldWindow, false);
}
}
--
Gitblit v1.9.1