Don't use custom highlight colour for output window in default theme

Also refactors the basic stylesheet into the theme

Author: cyderize

MiniZincIDE/codeeditor.cpp

@@ -168,22 +168,7 @@ void CodeEditor::setDarkMode(bool enable)
 //    palette.setColor(QPalette::HighlightedText, Themes::currentTheme.textColor.get(darkMode));
 //    this->setPalette(palette);
 
-    auto style_sheet = QString("background-color: %1;"
-                               "color: %2;")
-      .arg(Themes::currentTheme.backgroundColor.get(darkMode).name(QColor::HexArgb))
-      .arg(Themes::currentTheme.textColor.get(darkMode).name(QColor::HexArgb));
-
-    if (!Themes::currentTheme.isSystemTheme) {
-        // Only change highlight colour for non-system themes
-        // Many platforms have settings/accessibility options for this, so we should probably follow it by default
-        style_sheet += QString(
-            "selection-background-color: %1;"
-            "selection-color: %2;"
-        )
-          .arg(Themes::currentTheme.textHighlightColor.get(darkMode).name(QColor::HexArgb))
-          .arg(Themes::currentTheme.textColor.get(darkMode).name(QColor::HexArgb));
-    }
-    setStyleSheet(style_sheet);
+    setStyleSheet(Themes::currentTheme.styleSheet(darkMode));
     cursorChange(); // Ensure extra selections are the correct colours
 }
 

MiniZincIDE/highlighter.h

@@ -113,6 +113,26 @@ struct Theme
             foregroundActiveColor = textColor;
             foregroundInactiveColor = ThemeColor(textColor.light.lighter(), textColor.dark.darker());
         }
+
+        QString styleSheet(bool darkMode) {
+            auto style_sheet = QString("background-color: %1;"
+                                       "color: %2;")
+              .arg(backgroundColor.get(darkMode).name(QColor::HexArgb))
+              .arg(textColor.get(darkMode).name(QColor::HexArgb));
+
+            if (!isSystemTheme) {
+                // Only change highlight colour for non-system themes
+                // Many platforms have settings/accessibility options for this, so we should probably follow it by default
+                style_sheet += QString(
+                    "selection-background-color: %1;"
+                    "selection-color: %2;"
+                )
+                  .arg(textHighlightColor.get(darkMode).name(QColor::HexArgb))
+                  .arg(textColor.get(darkMode).name(QColor::HexArgb));
+            }
+
+            return style_sheet;
+        }
 };
 
 namespace Themes{

MiniZincIDE/mainwindow.cpp

@@ -2395,15 +2395,7 @@ void MainWindow::on_actionDark_mode_toggled(bool enable)
 #endif
     }
     ui->outputConsole->document()->setDefaultStyleSheet(".mznnotice { color : "+Themes::currentTheme.functionColor.get(darkMode).name()+" }");
-    auto style_sheet = QString("background-color: #%1;"
-                               "color: #%2;"
-                               "selection-background-color: #%3;"
-                               "selection-color: #%4;")
-      .arg(Themes::currentTheme.backgroundColor.get(darkMode).rgba(), 0, 16)
-      .arg(Themes::currentTheme.textColor.get(darkMode).rgba(), 0, 16)
-      .arg(Themes::currentTheme.textHighlightColor.get(darkMode).rgba(), 0, 16)
-      .arg(Themes::currentTheme.textColor.get(darkMode).rgba(), 0, 16);
-    ui->outputConsole->setStyleSheet(style_sheet);
+    ui->outputConsole->setStyleSheet(Themes::currentTheme.styleSheet(darkMode));
 //    auto palette = ui->outputConsole->palette();
 //    palette.setColor(QPalette::Text, Themes::currentTheme.textColor.get(darkMode));
 //    palette.setColor(QPalette::Base, Themes::currentTheme.backgroundColor.get(darkMode));