minor tweaks

Yuhang Zhao

2023-12-06 05fedeedb28df769ce16efea39be1cc5e2916b98

 src/core/contexts/abstractwindowcontext.cpp

@@ -2,22 +2,13 @@

namespace QWK {

    AbstractWindowContext::AbstractWindowContext(QWindow *window, WindowItemDelegate *delegate)
        : m_windowHandle(window), m_delegate(delegate) {
    AbstractWindowContext::AbstractWindowContext(QObject *host, WindowItemDelegate *delegate)
        : m_host(host), m_delegate(delegate), m_windowHandle(delegate->hostWindow(host)) {
    }

    AbstractWindowContext::~AbstractWindowContext() {
    }
    AbstractWindowContext::~AbstractWindowContext() = default;

    void AbstractWindowContext::setupWindow(QWindow *window) {
        Q_ASSERT(window);
        if (!window) {
            return;
        }
        m_windowHandle = window;
    }

    bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
    bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
        Q_ASSERT(obj);
        if (!obj) {
            return false;
@@ -47,7 +38,7 @@
    }

    bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
                                                QObject *obj) {
                                                const QObject *obj) {
        Q_ASSERT(obj);
        Q_ASSERT(button != CoreWindowAgent::Unknown);
        if (!obj || (button == CoreWindowAgent::Unknown)) {
@@ -61,7 +52,7 @@
        return true;
    }

    bool AbstractWindowContext::setTitleBar(QObject *item) {
    bool AbstractWindowContext::setTitleBar(const QObject *item) {
        Q_ASSERT(item);
        if (!item) {
            return false;
@@ -99,7 +90,7 @@
                continue;
            }
            if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
                *button = CoreWindowAgent::WindowIcon;
                *button = static_cast<CoreWindowAgent::SystemButton>(i);
                return true;
            }
        }
@@ -124,27 +115,30 @@
            return false;
        }

        if (!titleBarRect.contains(pos)) {
            return false;
        }

        for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
            auto currentButton = m_systemButtons[i];
            if (currentButton && m_delegate->isVisible(currentButton) &&
                m_delegate->isEnabled(currentButton) &&
                m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
                return true;
                return false;
            }
        }

        for (auto widget : m_hitTestVisibleItems) {
            if (widget && m_delegate->isVisible(widget) && m_delegate->isEnabled(widget) &&
                m_delegate->mapGeometryToScene(widget).contains(pos)) {
                return true;
                return false;
            }
        }

        if (hitTestShape().contains(pos)) {
            return true;
        if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
            return false;
        }

        return false;
        return true;
    }

}