Sine Striker
2023-12-04 8978e41163283d6c708cd69c046d994210a388b8
minor tweaks
5个文件已修改
88 ■■■■ 已修改文件
src/core/contexts/win32windowcontext.cpp 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/quick/quickwindowagent.cpp 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/quick/quickwindowagent.h 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/widgets/widgetwindowagent.cpp 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/widgets/widgetwindowagent.h 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/core/contexts/win32windowcontext.cpp
@@ -266,7 +266,7 @@
            case HTBORDER:
                return Win32WindowContext::FixedBorder;
            default:
                break;
                break; // unreachable
        }
        return Win32WindowContext::Outside;
    }
@@ -1165,6 +1165,8 @@
                                break;
                            case CoreWindowAgent::Unknown:
                                break;
                            default:
                                break; // unreachable
                        }
                    }
                    if (*result == HTNOWHERE) {
src/quick/quickwindowagent.cpp
@@ -41,19 +41,17 @@
        return true;
    }
    bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
    QQuickItem *QuickWindowAgent::titleBar() const {
        Q_D(const QuickWindowAgent);
        return d->context->isHitTestVisible(item);
        return static_cast<QQuickItem *>(d->context->titleBar());
    }
    void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
    void QuickWindowAgent::setTitleBar(QQuickItem *item) {
        Q_D(QuickWindowAgent);
        d->context->setHitTestVisible(item, visible);
    }
    void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
        Q_D(QuickWindowAgent);
        d->context->setHitTestVisible(rect, visible);
        if (!d->context->setTitleBar(item)) {
            return;
        }
        Q_EMIT titleBarWidgetChanged(item);
    }
    QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
@@ -69,17 +67,19 @@
        Q_EMIT systemButtonChanged(button, item);
    }
    QQuickItem *QuickWindowAgent::titleBar() const {
    bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
        Q_D(const QuickWindowAgent);
        return static_cast<QQuickItem *>(d->context->titleBar());
        return d->context->isHitTestVisible(item);
    }
    void QuickWindowAgent::setTitleBar(QQuickItem *item) {
    void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
        Q_D(QuickWindowAgent);
        if (!d->context->setTitleBar(item)) {
            return;
        }
        Q_EMIT titleBarWidgetChanged(item);
        d->context->setHitTestVisible(item, visible);
    }
    void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
        Q_D(QuickWindowAgent);
        d->context->setHitTestVisible(rect, visible);
    }
    QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent)
src/quick/quickwindowagent.h
@@ -21,15 +21,15 @@
    public:
        bool setup(QQuickWindow *window);
        bool isHitTestVisible(QQuickItem *item) const;
        void setHitTestVisible(QQuickItem *item, bool visible);
        void setHitTestVisible(const QRect &rect, bool visible);
        QQuickItem *titleBar() const;
        void setTitleBar(QQuickItem *item);
        QQuickItem *systemButton(SystemButton button) const;
        void setSystemButton(SystemButton button, QQuickItem *item);
        QQuickItem *titleBar() const;
        void setTitleBar(QQuickItem *item);
        bool isHitTestVisible(QQuickItem *item) const;
        void setHitTestVisible(QQuickItem *item, bool visible);
        void setHitTestVisible(const QRect &rect, bool visible);
    Q_SIGNALS:
        void titleBarWidgetChanged(QQuickItem *item);
src/widgets/widgetwindowagent.cpp
@@ -40,19 +40,17 @@
        return true;
    }
    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
    QWidget *WidgetWindowAgent::titleBar() const {
        Q_D(const WidgetWindowAgent);
        return d->context->isHitTestVisible(w);
        return static_cast<QWidget *>(d->context->titleBar());
    }
    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
    void WidgetWindowAgent::setTitleBar(QWidget *w) {
        Q_D(WidgetWindowAgent);
        d->context->setHitTestVisible(w, visible);
    }
    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
        Q_D(WidgetWindowAgent);
        d->context->setHitTestVisible(rect, visible);
        if (!d->context->setTitleBar(w)) {
            return;
        }
        Q_EMIT titleBarWidgetChanged(w);
    }
    QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
@@ -68,17 +66,19 @@
        Q_EMIT systemButtonChanged(button, w);
    }
    QWidget *WidgetWindowAgent::titleBar() const {
    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
        Q_D(const WidgetWindowAgent);
        return static_cast<QWidget *>(d->context->titleBar());
        return d->context->isHitTestVisible(w);
    }
    void WidgetWindowAgent::setTitleBar(QWidget *w) {
    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
        Q_D(WidgetWindowAgent);
        if (!d->context->setTitleBar(w)) {
            return;
        }
        Q_EMIT titleBarWidgetChanged(w);
        d->context->setHitTestVisible(w, visible);
    }
    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
        Q_D(WidgetWindowAgent);
        d->context->setHitTestVisible(rect, visible);
    }
    WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
src/widgets/widgetwindowagent.h
@@ -20,15 +20,15 @@
    public:
        bool setup(QWidget *w);
        bool isHitTestVisible(QWidget *w) const;
        void setHitTestVisible(QWidget *w, bool visible);
        void setHitTestVisible(const QRect &rect, bool visible);
        QWidget *titleBar() const;
        void setTitleBar(QWidget *w);
        QWidget *systemButton(SystemButton button) const;
        void setSystemButton(SystemButton button, QWidget *w);
        QWidget *titleBar() const;
        void setTitleBar(QWidget *w);
        bool isHitTestVisible(QWidget *w) const;
        void setHitTestVisible(QWidget *w, bool visible);
        void setHitTestVisible(const QRect &rect, bool visible);
    Q_SIGNALS:
        void titleBarWidgetChanged(QWidget *w);