refactor

Sine Striker

2023-12-11 c3c6647e7888b7dbe9d9d22fb77bf08104a3653c

 src/core/contexts/abstractwindowcontext.cpp

@@ -21,6 +21,13 @@
        m_host = host;
        m_delegate.reset(delegate);
        m_windowHandle = windowHandle;

        if (!setupHost()) {
            m_host = nullptr;
            m_delegate = nullptr;
            m_windowHandle = nullptr;
            return false;
        }
        return true;
    }

@@ -53,11 +60,11 @@
        return true;
    }

    bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
    bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
                                                const QObject *obj) {
        Q_ASSERT(obj);
        Q_ASSERT(button != CoreWindowAgent::Unknown);
        if (!obj || (button == CoreWindowAgent::Unknown)) {
        Q_ASSERT(button != WindowAgentBase::Unknown);
        if (!obj || (button == WindowAgentBase::Unknown)) {
            return false;
        }

@@ -81,9 +88,7 @@
        return true;
    }

    void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
        // ?
    }
    void AbstractWindowContext::showSystemMenu(const QPoint &pos){Q_UNUSED(pos)}

    QRegion AbstractWindowContext::hitTestShape() const {
        if (hitTestVisibleShapeDirty) {
@@ -97,16 +102,16 @@
    }

    bool AbstractWindowContext::isInSystemButtons(const QPoint &pos,
                                                  CoreWindowAgent::SystemButton *button) const {
        *button = CoreWindowAgent::Unknown;
        for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
                                                  WindowAgentBase::SystemButton *button) const {
        *button = WindowAgentBase::Unknown;
        for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
            auto currentButton = m_systemButtons[i];
            if (!currentButton || !m_delegate->isVisible(currentButton) ||
                !m_delegate->isEnabled(currentButton)) {
                continue;
            }
            if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
                *button = static_cast<CoreWindowAgent::SystemButton>(i);
                *button = static_cast<WindowAgentBase::SystemButton>(i);
                return true;
            }
        }
@@ -135,7 +140,7 @@
            return false;
        }

        for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
        for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
            auto currentButton = m_systemButtons[i];
            if (currentButton && m_delegate->isVisible(currentButton) &&
                m_delegate->isEnabled(currentButton) &&
@@ -157,4 +162,8 @@
        return true;
    }

    QObject *AbstractWindowContext::target() const {
        return m_host;
    }

}