Fix mac window mistakes

SineStriker

2023-12-16 abdad66bae077da6c3480db457beb47df5eda813

 src/widgets/widgetwindowagent.cpp

@@ -9,81 +9,9 @@

namespace QWK {

    class WidgetBorderHandler : public QObject {
    public:
        WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
            : widget(widget), ctx(ctx), m_thickness(0) {
            updateThickness();
            widget->installEventFilter(this);
        }
    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;

        void updateThickness() {
            // Query thickness
            bool native = false;
            void *a[] = {
                &native,
                &m_thickness,
            };
            ctx->virtual_hook(AbstractWindowContext::BorderThicknessHook, &a);
        }

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

    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);
                    QRect rect = paintEvent->rect();
                    QRegion region = paintEvent->region();
                    void *args[] = {
                        &painter,
                        &rect,
                        &region,
                    };
                    ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, args);
                    return true;
                }

                case QEvent::WindowStateChange: {
                    updateMargins();
                    break;
                }

                case QEvent::WindowActivate:
                case QEvent::WindowDeactivate: {
                    widget->update();
                    break;
                }

                    // TODO: Handle DPI Change

                default:
                    break;
            }
            return false;
        }

        QWidget *widget;
        AbstractWindowContext *ctx;
        quint32 m_thickness;
    };

    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
    }

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

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

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

    bool WidgetWindowAgent::setup(QWidget *w) {
        Q_ASSERT(w);
@@ -114,14 +41,9 @@
        }
        d->hostWidget = w;

        // Install painting hook
        if (bool needPaintBorder = false;
            d->context->virtual_hook(AbstractWindowContext::NeedsDrawBordersHook, &needPaintBorder),
            needPaintBorder) {
            auto borderHandler = std::make_unique<WidgetBorderHandler>(w, d->context.get());
            borderHandler->updateMargins();
            d->borderHandler = std::move(borderHandler);
        }
#ifdef Q_OS_WINDOWS
        d->setupWindows10BorderWorkaround();
#endif
        return true;
    }

@@ -135,6 +57,9 @@
        if (!d->context->setTitleBar(w)) {
            return;
        }
#ifdef Q_OS_MACOS
        d->setupMacOSTitleBar(w);
#endif
        Q_EMIT titleBarWidgetChanged(w);
    }