From f874811443991759df4231b5127788af059a0df9 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 15:55:52 +0800
Subject: [PATCH] Add raise hook
---
src/core/contexts/abstractwindowcontext.cpp | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index d69ab75..5ce7c8c 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"
@@ -19,9 +20,23 @@
m_delegate.reset(delegate);
m_windowHandle = m_delegate->hostWindow(m_host);
if (m_windowHandle) {
- m_windowHandleGuard = m_windowHandle;
- winIdChanged(nullptr, false);
+ winIdChanged(nullptr);
}
+ }
+
+ 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 *a[] = {
+ &const_cast<QString &>(key),
+ &newVar,
+ &oldVar,
+ };
+ virtual_hook(WindowAttributeChangedHook, a);
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -40,9 +55,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;
}
@@ -55,10 +69,6 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (!item) {
- return false;
- }
-
if (m_titleBar == item) {
return false;
}
@@ -145,12 +155,17 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
- // TODO: Qt
+ 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;
}
- case ShowSystemMenuHook: {
- // TODO: Qt
+ case RaiseWindowHook: {
+ if (m_windowHandle->windowStates() & Qt::WindowMinimized)
+ m_windowHandle->showNormal();
+ m_windowHandle->raise();
break;
}
@@ -176,7 +191,9 @@
void AbstractWindowContext::notifyWinIdChange() {
auto oldWindow = m_windowHandle;
m_windowHandle = m_delegate->window(m_host);
- winIdChanged(oldWindow, oldWindow && m_windowHandleGuard.isNull());
+ if (oldWindow == m_windowHandle)
+ return;
+ winIdChanged(oldWindow);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1