fix QML & Qt6

Yuhang Zhao

2023-12-11 ad494e6b019b9fea2daf3aa8ff17b37f79554528

 src/widgets/widgetwindowagent.cpp

@@ -21,65 +21,70 @@
    WidgetWindowAgent::~WidgetWindowAgent() {
    }

    void WidgetWindowAgent::setup(QWidget *w) {
    bool WidgetWindowAgent::setup(QWidget *w) {
        Q_ASSERT(w);
        if (!w) {
            return;
            return false;
        }

        Q_D(WidgetWindowAgent);
        if (d->host) {
            return;
        if (d->hostWidget) {
            return false;
        }
        d->host = w;

        std::ignore = w->winId(); // Make sure the window handle is created
        d->setup(w->windowHandle(), new WidgetItemDelegate());
    }
        w->setAttribute(Qt::WA_DontCreateNativeAncestors);
        w->setAttribute(Qt::WA_NativeWindow);

    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
        Q_D(const WidgetWindowAgent);
        return d->m_eventHandler->isHitTestVisible(w);
    }

    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
        Q_D(WidgetWindowAgent);
        d->m_eventHandler->setHitTestVisible(w, visible);
    }

    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
        Q_D(WidgetWindowAgent);
        d->m_eventHandler->setHitTestVisible(rect, visible);
    }

    QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
        Q_D(const WidgetWindowAgent);
        return static_cast<QWidget *>(d->m_eventHandler->systemButton(button));
    }

    void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
        Q_D(WidgetWindowAgent);
        if (!d->m_eventHandler->setSystemButton(button, w)) {
            return;
        if (!d->setup(w, new WidgetItemDelegate())) {
            return false;
        }
        Q_EMIT systemButtonChanged(button, w);
        d->hostWidget = w;
        return true;
    }

    QWidget *WidgetWindowAgent::titleBar() const {
    const QWidget *WidgetWindowAgent::titleBar() const {
        Q_D(const WidgetWindowAgent);
        return static_cast<QWidget *>(d->m_eventHandler->titleBar());
        return static_cast<const QWidget *>(d->context->titleBar());
    }

    void WidgetWindowAgent::setTitleBar(QWidget *w) {
    void WidgetWindowAgent::setTitleBar(const QWidget *w) {
        Q_D(WidgetWindowAgent);
        if (!d->m_eventHandler->setTitleBar(w)) {
        if (!d->context->setTitleBar(w)) {
            return;
        }
        Q_EMIT titleBarWidgetChanged(w);
    }

    const QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
        Q_D(const WidgetWindowAgent);
        return static_cast<const QWidget *>(d->context->systemButton(button));
    }

    void WidgetWindowAgent::setSystemButton(SystemButton button, const QWidget *w) {
        Q_D(WidgetWindowAgent);
        if (!d->context->setSystemButton(button, w)) {
            return;
        }
        Q_EMIT systemButtonChanged(button, w);
    }

    bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
        Q_D(const WidgetWindowAgent);
        return d->context->isHitTestVisible(w);
    }

    void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
        Q_D(WidgetWindowAgent);
        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)
        : CoreWindowAgent(d, parent) {
        : WindowAgentBase(d, parent) {
        d.init();
    }
}