Remove redundant API anyway

Sine Striker

2023-12-20 fb776030fc1673bc22d8e9f8972ee9009438d6a3

 src/widgets/widgetwindowagent_win.cpp

@@ -2,19 +2,18 @@

#include <QtGui/QPainter>

#include <QWKCore/private/eventobserver_p.h>
#include <QWKCore/qwindowkit_windows.h>
#include <QWKCore/private/nativeeventfilter_p.h>

namespace QWK {

    class WidgetBorderHandler : public QObject, public EventObserver {
        Q_OBJECT
    class WidgetBorderHandler : public QObject, public NativeEventFilter {
    public:
        explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx,
                                     QObject *parent = nullptr)
            : QObject(parent), widget(widget), ctx(ctx) {
        explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
            : QObject(ctx), widget(widget), ctx(ctx) {
            widget->installEventFilter(this);

            ctx->addObserver(this);
            ctx->installNativeEventFilter(this);
            updateGeometry();
        }

@@ -32,15 +31,29 @@
        }

    protected:
        bool observe(QEvent *event) override {
            switch (event->type()) {
                case QEvent::UpdateRequest: {
        bool nativeEventFilter(const QByteArray &eventType, void *message,
                               QT_NATIVE_EVENT_RESULT_TYPE *result) override {
            Q_UNUSED(eventType)
            const auto msg = static_cast<const MSG *>(message);
            switch (msg->message) {
                case WM_DPICHANGED: {
                    updateGeometry();
                    break;
                }

                case WM_THEMECHANGED:
                case WM_SYSCOLORCHANGE:
                case WM_DWMCOLORIZATIONCOLORCHANGED: {
                    widget->update();
                    break;
                }

                case QEvent::ScreenChangeInternal: {
                    updateGeometry();
                case WM_SETTINGCHANGE: {
                    if (!msg->wParam && msg->lParam &&
                        std::wcscmp(reinterpret_cast<LPCWSTR>(msg->lParam), L"ImmersiveColorSet") ==
                            0) {
                        widget->update();
                    }
                    break;
                }

@@ -51,9 +64,10 @@
        }

        bool eventFilter(QObject *obj, QEvent *event) override {
            Q_UNUSED(obj)
            switch (event->type()) {
                case QEvent::Paint: {
                    if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
                    if (widget->windowState() & (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen))
                        break;

                    auto paintEvent = static_cast<QPaintEvent *>(event);
@@ -67,7 +81,7 @@
                        &region,
                    };
                    ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
                    return true;
                    break;
                }

                case QEvent::WindowStateChange: {
@@ -95,10 +109,8 @@
        // Install painting hook
        auto ctx = context.get();
        if (ctx->property("needBorderPainter").toBool()) {
            std::ignore = new WidgetBorderHandler(hostWidget, ctx, ctx);
            std::ignore = new WidgetBorderHandler(hostWidget, ctx);
        }
    }

}

#include "widgetwindowagent_win.moc"