From 327055934009dc416be6234db8e4d26fab81fb80 Mon Sep 17 00:00:00 2001 From: SineStriker <55847490+SineStriker@users.noreply.github.com> Date: ćšć, 21 12æ 2023 23:21:28 +0800 Subject: [PATCH] Merge pull request #8 from stdware/stylesupport --- src/core/contexts/abstractwindowcontext.cpp | 126 +++++++++++++++++++++++------------------ 1 files changed, 71 insertions(+), 55 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp index 3b2340f..0d72e3c 100644 --- a/src/core/contexts/abstractwindowcontext.cpp +++ b/src/core/contexts/abstractwindowcontext.cpp @@ -2,36 +2,50 @@ #include <QtGui/QPen> #include <QtGui/QPainter> +#include <QtGui/QScreen> +#include <memory> #include "qwkglobal_p.h" namespace QWK { + class WinIdChangeEventFilter : public QObject { + public: + explicit WinIdChangeEventFilter(QObject *widget, AbstractWindowContext *ctx, + QObject *parent = nullptr) + : QObject(parent), ctx(ctx) { + widget->installEventFilter(this); + } + + protected: + bool eventFilter(QObject *obj, QEvent *event) override { + Q_UNUSED(obj) + if (event->type() == QEvent::WinIdChange) { + ctx->notifyWinIdChange(); + } + return false; + } + + protected: + AbstractWindowContext *ctx; + }; + 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; + m_winIdChangeEventFilter = std::make_unique<WinIdChangeEventFilter>(host, this); - if (!setupHost()) { - m_host = nullptr; - m_delegate.reset(); - m_windowHandle = nullptr; - return false; + m_windowHandle = m_delegate->hostWindow(m_host); + if (m_windowHandle) { + winIdChanged(); } - return true; } bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) { @@ -48,26 +62,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; } @@ -80,27 +78,28 @@ bool AbstractWindowContext::setTitleBar(QObject *item) { Q_ASSERT(item); - if (!item) { - return false; - } - if (m_titleBar == item) { return false; } + + if (m_titleBar) { + // Since the title bar is changed, all items inside it should be dereferenced right away + for (auto &button : m_systemButtons) { + button = nullptr; + } + m_hitTestVisibleItems.clear(); + } + m_titleBar = item; return true; } - QRegion AbstractWindowContext::hitTestShape() const { - if (hitTestVisibleShapeDirty) { - hitTestVisibleShape = {}; - for (const auto &rect : m_hitTestVisibleRects) { - hitTestVisibleShape += rect; - } - hitTestVisibleShapeDirty = false; - } - return hitTestVisibleShape; +#ifdef Q_OS_MAC + void AbstractWindowContext::setSystemButtonArea(const QRect &rect) { + m_systemButtonArea = rect; + virtual_hook(SystemButtonAreaChangedHook, nullptr); } +#endif bool AbstractWindowContext::isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const { @@ -157,9 +156,6 @@ } } - if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) { - return false; - } return true; } @@ -177,13 +173,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: { @@ -205,4 +213,12 @@ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos)); } -} \ No newline at end of file + void AbstractWindowContext::notifyWinIdChange() { + auto oldWindow = m_windowHandle; + m_windowHandle = m_delegate->hostWindow(m_host); + if (oldWindow == m_windowHandle) + return; + winIdChanged(); + } + +} -- Gitblit v1.9.1