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 | 132 ++++++++++++++++++++-----------------------
1 files changed, 62 insertions(+), 70 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 3c902e9..5ce7c8c 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,43 +2,41 @@
#include <QtGui/QPen>
#include <QtGui/QPainter>
+#include <QtGui/QScreen>
#include "qwkglobal_p.h"
namespace QWK {
- QWK_USED static constexpr const struct {
- const quint32 activeLight = MAKE_RGBA_COLOR(210, 233, 189, 226);
- const quint32 activeDark = MAKE_RGBA_COLOR(177, 205, 190, 240);
- const quint32 inactiveLight = MAKE_RGBA_COLOR(193, 195, 211, 203);
- const quint32 inactiveDark = MAKE_RGBA_COLOR(240, 240, 250, 255);
- } kSampleColorSet;
-
AbstractWindowContext::AbstractWindowContext() = default;
AbstractWindowContext::~AbstractWindowContext() = default;
- bool AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
- if (!host || !delegate) {
- return false;
+ void AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
+ if (m_host || !host || !delegate) {
+ return;
}
-
- auto windowHandle = delegate->hostWindow(host);
- if (!windowHandle) {
- return false;
- }
-
m_host = host;
m_delegate.reset(delegate);
- m_windowHandle = windowHandle;
-
- if (!setupHost()) {
- m_host = nullptr;
- m_delegate.reset();
- m_windowHandle = nullptr;
- return false;
+ m_windowHandle = m_delegate->hostWindow(m_host);
+ if (m_windowHandle) {
+ winIdChanged(nullptr);
}
- return 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 *a[] = {
+ &const_cast<QString &>(key),
+ &newVar,
+ &oldVar,
+ };
+ virtual_hook(WindowAttributeChangedHook, a);
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -55,26 +53,10 @@
return true;
}
- bool AbstractWindowContext::setHitTestVisible(const QRect &rect, bool visible) {
- Q_ASSERT(rect.isValid());
- if (!rect.isValid()) {
- return false;
- }
-
- if (visible) {
- m_hitTestVisibleRects.append(rect);
- } else {
- m_hitTestVisibleRects.removeAll(rect);
- }
- hitTestVisibleShapeDirty = true;
- return true;
- }
-
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;
}
@@ -87,10 +69,6 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (!item) {
- return false;
- }
-
if (m_titleBar == item) {
return false;
}
@@ -98,20 +76,12 @@
return true;
}
- void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+#ifdef Q_OS_MAC
+ void AbstractWindowContext::setSystemButtonArea(const QRect &rect) {
+ m_systemButtonArea = rect;
+ virtual_hook(SystemButtonAreaChangedHook, nullptr);
}
-
- QRegion AbstractWindowContext::hitTestShape() const {
- if (hitTestVisibleShapeDirty) {
- hitTestVisibleShape = {};
- for (const auto &rect : m_hitTestVisibleRects) {
- hitTestVisibleShape += rect;
- }
- hitTestVisibleShapeDirty = false;
- }
- return hitTestVisibleShape;
- }
+#endif
bool AbstractWindowContext::isInSystemButtons(const QPoint &pos,
WindowAgentBase::SystemButton *button) const {
@@ -168,9 +138,6 @@
}
}
- if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
- return false;
- }
return true;
}
@@ -178,30 +145,55 @@
return {};
}
+ QWK_USED static constexpr const struct {
+ const quint32 activeLight = MAKE_RGBA_COLOR(210, 233, 189, 226);
+ const quint32 activeDark = MAKE_RGBA_COLOR(177, 205, 190, 240);
+ const quint32 inactiveLight = MAKE_RGBA_COLOR(193, 195, 211, 203);
+ const quint32 inactiveDark = MAKE_RGBA_COLOR(240, 240, 250, 255);
+ } kSampleColorSet;
+
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;
}
case DefaultColorsHook: {
- auto map = *reinterpret_cast<QMap<QString, QColor> *>(data);
+ auto &map = *static_cast<QMap<QString, QColor> *>(data);
map.clear();
- map.insert("activeLight", kSampleColorSet.activeLight);
- map.insert("activeDark", kSampleColorSet.activeDark);
- map.insert("inactiveLight", kSampleColorSet.inactiveLight);
- map.insert("inactiveDark", kSampleColorSet.inactiveDark);
+ map.insert(QStringLiteral("activeLight"), kSampleColorSet.activeLight);
+ map.insert(QStringLiteral("activeDark"), kSampleColorSet.activeDark);
+ map.insert(QStringLiteral("inactiveLight"), kSampleColorSet.inactiveLight);
+ map.insert(QStringLiteral("inactiveDark"), kSampleColorSet.inactiveDark);
return;
}
+
default:
break;
}
}
-}
\ No newline at end of file
+ void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
+ }
+
+ void AbstractWindowContext::notifyWinIdChange() {
+ auto oldWindow = m_windowHandle;
+ m_windowHandle = m_delegate->window(m_host);
+ if (oldWindow == m_windowHandle)
+ return;
+ winIdChanged(oldWindow);
+ }
+
+}
--
Gitblit v1.9.1