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 | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index ef1efbf..193cae2 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,26 @@
}
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();
}
+ }
+
+ 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) {
@@ -39,9 +56,8 @@
bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
QObject *obj) {
- Q_ASSERT(obj);
Q_ASSERT(button != WindowAgentBase::Unknown);
- if (!obj || (button == WindowAgentBase::Unknown)) {
+ if (button == WindowAgentBase::Unknown) {
return false;
}
@@ -54,10 +70,6 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (!item) {
- return false;
- }
-
if (m_titleBar == item) {
return false;
}
@@ -144,13 +156,25 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
- // TODO: Qt
- break;
+ 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;
+ 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: {
@@ -177,7 +201,7 @@
m_windowHandle = m_delegate->window(m_host);
if (oldWindow == m_windowHandle)
return;
- winIdChanged(oldWindow);
+ winIdChanged();
}
}
--
Gitblit v1.9.1