X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=af89671cbadeb6b52b77fe707aaf86a265703f12;hp=55ceb5a9e4e382b80cef0ad61cde72f0e0142888;hb=43be386b1714c50b6e10a382f3bec194b914354f;hpb=37b0bd3594a0effb8252c22377f003deafc55b19

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 55ceb5a9..af89671c 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -26,6 +26,8 @@
 #include <QFontMetrics>
 #include <QPixmapCache>
 #include <QString>
+#include <QStyleFactory>
+#include <QtGlobal>
 
 using std::map;
 using std::pair;
@@ -142,6 +144,9 @@ void GlobalSettings::apply_theme()
 	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);
@@ -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) {
+#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);
@@ -224,7 +232,7 @@ void GlobalSettings::undo_tracked_changes()
 {
 	tracking_ = false;
 
-	for (auto entry : tracked_changes_)
+	for (auto& entry : tracked_changes_)
 		setValue(entry.first, entry.second);
 
 	tracked_changes_.clear();