Fix mac window mistakes

SineStriker

2023-12-16 abdad66bae077da6c3480db457beb47df5eda813

 src/widgets/widgetwindowagent.cpp

@@ -5,64 +5,13 @@
#include <QtGui/QPainter>
#include <QtCore/QDebug>

#ifdef Q_OS_WINDOWS
#  include <QWKCore/private/win10borderhandler_p.h>
#endif

#include "widgetitemdelegate_p.h"

namespace QWK {

#ifdef Q_OS_WINDOWS
    class WidgetBorderHandler : public QObject, public Win10BorderHandler {
    public:
        explicit WidgetBorderHandler(QWidget *widget)
            : Win10BorderHandler(widget->windowHandle()), widget(widget) {
            widget->installEventFilter(this);
        }
    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;

        void updateGeometry() override {
            if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
                widget->setContentsMargins({});
            } else {
                widget->setContentsMargins({0, int(m_borderThickness), 0, 0});
            }
        }

        void requestUpdate() override {
            widget->update();
        }

        bool isActive() const override {
            return widget->isActiveWindow();
        }

    protected:
        bool eventFilter(QObject *obj, QEvent *event) override {
            switch (event->type()) {
                case QEvent::Paint: {
                    if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
                        break;
                    auto paintEvent = static_cast<QPaintEvent *>(event);
                    QPainter painter(widget);
                    paintBorder(painter, paintEvent->rect(), paintEvent->region());
                    return true;
                }
                default:
                    break;
            }
            return false;
        }

        QWidget *widget;
    };
#endif

    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
    }

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

    void WidgetWindowAgentPrivate::init() {
    }
@@ -71,8 +20,7 @@
        : WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
    }

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

    bool WidgetWindowAgent::setup(QWidget *w) {
        Q_ASSERT(w);
@@ -94,15 +42,7 @@
        d->hostWidget = w;

#ifdef Q_OS_WINDOWS
        // Install painting hook
        if (bool needPaintBorder;
            QMetaObject::invokeMethod(d->context.get(), "needWin10BorderHandler",
                                      Qt::DirectConnection, Q_RETURN_ARG(bool, needPaintBorder)),
            needPaintBorder) {
            QMetaObject::invokeMethod(d->context.get(), "setWin10BorderHandler",
                                      Qt::DirectConnection,
                                      Q_ARG(Win10BorderHandler *, new WidgetBorderHandler(w)));
        }
        d->setupWindows10BorderWorkaround();
#endif
        return true;
    }
@@ -117,6 +57,9 @@
        if (!d->context->setTitleBar(w)) {
            return;
        }
#ifdef Q_OS_MACOS
        d->setupMacOSTitleBar(w);
#endif
        Q_EMIT titleBarWidgetChanged(w);
    }