GlobalSettings: Always use Fusion style on Windows for dark themes

[pulseview.git] / pv / globalsettings.cpp

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 55ceb5a9e4e382b80cef0ad61cde72f0e0142888..af89671cbadeb6b52b77fe707aaf86a265703f12 100644 (file)
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -26,6 +26,8 @@
 #include <QFontMetrics>
 #include <QPixmapCache>
 #include <QString>
 #include <QFontMetrics>
 #include <QPixmapCache>
 #include <QString>

+#include <QStyleFactory>
+#include <QtGlobal>

 
 using std::map;
 using std::pair;
 
 using std::map;
 using std::pair;


@@ -142,6 +144,9 @@ void GlobalSettings::apply_theme()
        qApp->setPalette(default_palette_);
 
        if (theme_name.compare("QDarkStyleSheet") == 0) {
        qApp->setPalette(default_palette_);
 
        if (theme_name.compare("QDarkStyleSheet") == 0) {

+#ifdef Q_OS_WIN
+               qApp->setStyle(QStyleFactory::create("Fusion"));
+#endif

                QPalette dark_palette;
                dark_palette.setColor(QPalette::Window, QColor(53, 53, 53));
                dark_palette.setColor(QPalette::WindowText, Qt::white);
                QPalette dark_palette;
                dark_palette.setColor(QPalette::Window, QColor(53, 53, 53));
                dark_palette.setColor(QPalette::WindowText, Qt::white);


@@ -150,6 +155,9 @@ void GlobalSettings::apply_theme()
                dark_palette.setColor(QPalette::Highlight, QColor(42, 130, 218));
                qApp->setPalette(dark_palette);
        } else if (theme_name.compare("DarkStyle") == 0) {
                dark_palette.setColor(QPalette::Highlight, QColor(42, 130, 218));
                qApp->setPalette(dark_palette);
        } else if (theme_name.compare("DarkStyle") == 0) {

+#ifdef Q_OS_WIN
+               qApp->setStyle(QStyleFactory::create("Fusion"));
+#endif

                QPalette dark_palette;
                dark_palette.setColor(QPalette::Window, QColor(53, 53, 53));
                dark_palette.setColor(QPalette::WindowText, Qt::white);
                QPalette dark_palette;
                dark_palette.setColor(QPalette::Window, QColor(53, 53, 53));
                dark_palette.setColor(QPalette::WindowText, Qt::white);


@@ -224,7 +232,7 @@ void GlobalSettings::undo_tracked_changes()
 {
        tracking_ = false;
 
 {
        tracking_ = false;
 

-       for (auto entry : tracked_changes_)
+       for (auto& entry : tracked_changes_)

                setValue(entry.first, entry.second);
 
        tracked_changes_.clear();
                setValue(entry.first, entry.second);
 
        tracked_changes_.clear();