From a6313a5c98893fa7f3c107d59c4ddcd1a627b272 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A9ven=20Car?= Date: Sat, 9 Mar 2024 12:54:15 +0100 Subject: [PATCH] Handle deprecation of QGuiApplication::paletteChanged NO_CHANGELOG --- src/dolphintabwidget.cpp | 2 +- src/selectionmode/backgroundcolorhelper.cpp | 13 ++++++++++--- src/selectionmode/backgroundcolorhelper.h | 7 ++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index 32e251f02..9bfd6076a 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -23,9 +23,9 @@ DolphinTabWidget::DolphinTabWidget(DolphinNavigatorsWidgetAction *navigatorsWidget, QWidget *parent) : QTabWidget(parent) + , m_dragAndDropHelper{this} , m_lastViewedTab(nullptr) , m_navigatorsWidget{navigatorsWidget} - , m_dragAndDropHelper{this} { KAcceleratorManager::setNoAccel(this); diff --git a/src/selectionmode/backgroundcolorhelper.cpp b/src/selectionmode/backgroundcolorhelper.cpp index fa3e55ac4..d1a25bace 100644 --- a/src/selectionmode/backgroundcolorhelper.cpp +++ b/src/selectionmode/backgroundcolorhelper.cpp @@ -43,12 +43,19 @@ void BackgroundColorHelper::controlBackgroundColor(QWidget *widget) m_colorControlledWidgets.emplace_back(widget); } +bool BackgroundColorHelper::eventFilter(QObject *obj, QEvent *event) +{ + Q_UNUSED(obj); + if (event->type() == QEvent::ApplicationPaletteChange) { + slotPaletteChanged(); + } + return false; +} + BackgroundColorHelper::BackgroundColorHelper() { updateBackgroundColor(); - QObject::connect(qApp, &QGuiApplication::paletteChanged, qApp, [=]() { - slotPaletteChanged(); - }); + qApp->installEventFilter(this); } void BackgroundColorHelper::slotPaletteChanged() diff --git a/src/selectionmode/backgroundcolorhelper.h b/src/selectionmode/backgroundcolorhelper.h index 3450c8e19..4f8ce81f5 100644 --- a/src/selectionmode/backgroundcolorhelper.h +++ b/src/selectionmode/backgroundcolorhelper.h @@ -9,6 +9,7 @@ #define BACKGROUNDCOLORHELPER_H #include +#include #include #include @@ -21,8 +22,9 @@ namespace SelectionMode /** * @brief A Singleton class for managing the colors of selection mode widgets. */ -class BackgroundColorHelper +class BackgroundColorHelper : public QObject { + Q_OBJECT public: static BackgroundColorHelper *instance(); @@ -32,6 +34,9 @@ public: */ void controlBackgroundColor(QWidget *widget); +protected: + bool eventFilter(QObject *obj, QEvent *event) override; + private: BackgroundColorHelper(); -- 2.47.3