Use Qt's default platformtheme palette

This may result into some wrong colors, but it's better than no colors when using empty palette
FedoraQt · Apr 19, 2020 · d4277c9 · d4277c9
1 parent 2f48414
commit d4277c9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 37 deletions.
diff --git a/common/gnomehintssettings.cpp b/common/gnomehintssettings.cpp
@@ -139,7 +139,6 @@ GnomeHintsSettings::GnomeHintsSettings()
         cursorSizeChanged();
 
     loadFonts();
-    loadPalette();
     loadStaticHints();
     loadTheme();
     loadTitlebar();
@@ -148,7 +147,6 @@ GnomeHintsSettings::GnomeHintsSettings()
 GnomeHintsSettings::~GnomeHintsSettings()
 {
     qDeleteAll(m_fonts);
-    delete m_palette;
     if (m_cinnamonSettings) {
         g_object_unref(m_cinnamonSettings);
     }
@@ -263,18 +261,7 @@ void GnomeHintsSettings::iconsChanged()
 
 void GnomeHintsSettings::themeChanged()
 {
-    loadPalette();
     loadTheme();
-
-    // QApplication::setPalette and QGuiApplication::setPalette are different functions
-    // and non virtual. Call the correct one
-    if (qobject_cast<QApplication *>(QCoreApplication::instance())) {
-        QApplication::setPalette(*m_palette);
-        if (QStyleFactory::keys().contains(m_gtkTheme, Qt::CaseInsensitive))
-            QApplication::setStyle(m_gtkTheme);
-    } else if (qobject_cast<QGuiApplication *>(QCoreApplication::instance())) {
-        QGuiApplication::setPalette(*m_palette);
-    }
 }
 
 void GnomeHintsSettings::loadTitlebar()
@@ -409,16 +396,6 @@ void GnomeHintsSettings::loadFonts()
     }
 }
 
-void GnomeHintsSettings::loadPalette()
-{
-    if (m_palette) {
-        delete m_palette;
-        m_palette = nullptr;
-    }
-
-    m_palette = new QPalette();
-}
-
 void GnomeHintsSettings::loadStaticHints() {
     int cursorBlinkTime = getSettingsProperty<int>(QStringLiteral("cursor-blink-time"));
     if (cursorBlinkTime >= 100) {

diff --git a/common/gnomehintssettings.h b/common/gnomehintssettings.h
@@ -36,7 +36,6 @@
 
 #include <qpa/qplatformtheme.h>
 
-class QPalette;
 
 class GnomeHintsSettings : public QObject
 {
@@ -84,11 +83,6 @@ class GnomeHintsSettings : public QObject
         return m_hints[hint];
     }
 
-    inline QPalette *palette() const
-    {
-        return m_palette;
-    }
-
     inline TitlebarButtons titlebarButtons() const
     {
         return m_titlebarButtons;
@@ -110,7 +104,6 @@ private Q_SLOTS:
     void loadFonts();
     void loadTheme();
     void loadTitlebar();
-    void loadPalette();
     void loadStaticHints();
     void portalSettingChanged(const QString &group, const QString &key, const QDBusVariant &value);
 
@@ -169,7 +162,6 @@ private Q_SLOTS:
     TitlebarButtons m_titlebarButtons = TitlebarButton::CloseButton;
     TitlebarButtonsPlacement m_titlebarButtonPlacement = TitlebarButtonsPlacement::RightPlacement;
     QString m_gtkTheme = nullptr;
-    QPalette *m_palette = nullptr;
     GSettings *m_cinnamonSettings = nullptr;
     GSettings *m_gnomeDesktopSettings = nullptr;
     GSettings *m_settings = nullptr;

diff --git a/theme/qgnomeplatformtheme.cpp b/theme/qgnomeplatformtheme.cpp
@@ -68,12 +68,7 @@ const QFont *QGnomePlatformTheme::font(Font type) const
 
 const QPalette *QGnomePlatformTheme::palette(Palette type) const
 {
-    QPalette *palette = m_hints->palette();
-    if (palette && type == QPlatformTheme::SystemPalette) {
-        return palette;
-    } else {
-        return QPlatformTheme::palette(type);
-    }
+    return QPlatformTheme::palette(type);
 }
 
 bool QGnomePlatformTheme::usePlatformNativeDialog(QPlatformTheme::DialogType type) const