From 995dc0b4d52e66adac84812dedf32785a65bce83 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 20 12月 2023 21:36:48 +0800
Subject: [PATCH] Remove hot-switch
---
src/core/contexts/abstractwindowcontext.cpp | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 0602bdc..193cae2 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -18,9 +18,10 @@
}
m_host = host;
m_delegate.reset(delegate);
- m_windowHandle = m_delegate->hostWindow(m_host);
+
+ m_windowHandle = m_delegate->window(m_host);
if (m_windowHandle) {
- winIdChanged(nullptr);
+ winIdChanged();
}
}
@@ -31,12 +32,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) {
@@ -155,6 +156,9 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
+ if (!m_windowHandle)
+ return;
+
QRect screenGeometry = m_windowHandle->screen()->geometry();
int x = (screenGeometry.width() - m_windowHandle->width()) / 2;
int y = (screenGeometry.height() - m_windowHandle->height()) / 2;
@@ -197,7 +201,7 @@
m_windowHandle = m_delegate->window(m_host);
if (oldWindow == m_windowHandle)
return;
- winIdChanged(oldWindow);
+ winIdChanged();
}
}
--
Gitblit v1.9.1