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 | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5ce7c8c..535ffc2 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -18,10 +18,7 @@
}
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) {
@@ -31,12 +28,12 @@
auto newVar = var;
auto oldVar = it.value();
- void *a[] = {
+ void *args[] = {
&const_cast<QString &>(key),
&newVar,
&oldVar,
};
- virtual_hook(WindowAttributeChangedHook, a);
+ virtual_hook(WindowAttributeChangedHook, args);
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -156,17 +153,21 @@
switch (id) {
case CentralizeHook: {
QRect screenGeometry = m_windowHandle->screen()->geometry();
- int x = screenGeometry.width() / 2 - m_windowHandle->width() / 2;
- int y = screenGeometry.height() / 2 - m_windowHandle->height() / 2;
- m_windowHandle->setPosition(x, y);
- break;
+ 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 RaiseWindowHook: {
- if (m_windowHandle->windowStates() & Qt::WindowMinimized)
- m_windowHandle->showNormal();
- m_windowHandle->raise();
- break;
+ 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: {
@@ -189,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