added settings for theme and theme hue

colorscheme.cpp

@@ -1,11 +1,50 @@
 #define LOOKUP_COLOR_COUNT 360
 
 #include "colorscheme.h"
+#include "settings.h"
+#include "windows.h"
 
 #include <QColor>
 
 namespace chatterino {
 
+void
+ColorScheme::init()
+{
+    static bool initiated = false;
+
+    if (!initiated) {
+        initiated = true;
+        ColorScheme::getInstance().update();
+        Settings::getInstance().theme.valueChanged.connect(
+            [](const QString &) { ColorScheme::getInstance().update(); });
+        Settings::getInstance().themeHue.valueChanged.connect(
+            [](const float &) { ColorScheme::getInstance().update(); });
+
+        ColorScheme::getInstance().updated.connect(
+            [] { Windows::repaintVisibleChatWidgets(); });
+    }
+}
+
+void
+ColorScheme::update()
+{
+    QString theme = Settings::getInstance().theme.get();
+    theme = theme.toLower();
+
+    qreal hue = Settings::getInstance().themeHue.get();
+
+    if (theme == "light") {
+        setColors(hue, 0.8);
+    } else if (theme == "white") {
+        setColors(hue, 1);
+    } else if (theme == "black") {
+        setColors(hue, -1);
+    } else {
+        setColors(hue, -0.8);
+    }
+}
+
 // hue: theme color (0 - 1)
 // multiplyer: 1 = white, 0.8 = light, -0.8 dark, -1 black
 void
@@ -69,6 +108,8 @@ ColorScheme::setColors(float hue, float multiplyer)
         "border:" + TabSelectedBackground.name() + ";" +
         "color:" + Text.name() + ";" +
         "selection-background-color:" + TabSelectedBackground.name();
+
+    updated();
 }
 
 void ColorScheme::fillLookupTableValues(qreal (&array)[360], qreal from,

colorscheme.h

@@ -3,6 +3,7 @@
 
 #include <QBrush>
 #include <QColor>
+#include <boost/signals2.hpp>
 
 namespace chatterino {
 
@@ -68,15 +69,21 @@ public:
         return instance;
     }
 
+    void init();
     void normalizeColor(QColor &color);
 
-    void setColors(float hue, float multiplyer);
+    void update();
+
+    boost::signals2::signal<void()> updated;
 
 private:
     ColorScheme()
+        : updated()
     {
     }
 
+    void setColors(float hue, float multiplyer);
+
     qreal middleLookupTable[360] = {};
     qreal minLookupTable[360] = {};
 

main.cpp

@@ -10,6 +10,7 @@
 
 #include <QApplication>
 #include <QClipboard>
+#include <boost/signals2.hpp>
 
 using namespace chatterino;
 using namespace chatterino::widgets;
@@ -24,7 +25,7 @@ main(int argc, char *argv[])
     Emojis::loadEmojis();
     Emotes::loadGlobalEmotes();
 
-    ColorScheme::getInstance().setColors(0, -0.8);
+    ColorScheme::getInstance().init();
 
     Windows::load();
 

settings.cpp

@@ -16,6 +16,7 @@ Settings::Settings()
     , portable(false)
     , wordTypeMask(messages::Word::Default)
     , theme(this->settingsItems, "theme", "dark")
+    , themeHue(this->settingsItems, "themeHue", 0)
     , selectedUser(this->settingsItems, "selectedUser", "")
     , emoteScale(this->settingsItems, "emoteScale", 1.0)
     , mouseScrollMultiplier(this->settingsItems, "mouseScrollMultiplier", 1.0)
@@ -45,7 +46,7 @@ Settings::Settings()
     , enableGifAnimations(this->settingsItems, "enableGifAnimations", true)
     , enableGifs(this->settingsItems, "enableGifs", true)
     , inlineWhispers(this->settingsItems, "inlineWhispers", true)
-    , windowTopMost(this->settingsItems, "windowTopMost", true)
+    , windowTopMost(this->settingsItems, "windowTopMost", false)
     , hideTabX(this->settingsItems, "hideTabX", false)
 {
     this->showTimestamps.valueChanged.connect(

settings.h

@@ -80,6 +80,7 @@ private:
 
 public:
     Setting<QString> theme;
+    Setting<float> themeHue;
     Setting<QString> selectedUser;
     Setting<float> emoteScale;
     Setting<float> mouseScrollMultiplier;

widgets/notebookbutton.cpp

@@ -21,7 +21,7 @@ NotebookButton::paintEvent(QPaintEvent *)
     QColor background;
     QColor foreground;
 
-    auto colorScheme = ColorScheme::getInstance();
+    auto &colorScheme = ColorScheme::getInstance();
 
     if (mouseDown) {
         background = colorScheme.TabSelectedBackground;

widgets/notebooktab.cpp

@@ -91,7 +91,7 @@ NotebookTab::paintEvent(QPaintEvent *)
 
     QColor fg = QColor(0, 0, 0);
 
-    auto colorScheme = ColorScheme::getInstance();
+    auto &colorScheme = ColorScheme::getInstance();
 
     if (this->selected) {
         painter.fillRect(rect(), colorScheme.TabSelectedBackground);

widgets/settingsdialog.cpp

@@ -1,5 +1,6 @@
 #include "widgets/settingsdialog.h"
 #include "widgets/settingsdialogtab.h"
+#include "windows.h"
 
 #include <QComboBox>
 #include <QFile>
@@ -80,6 +81,45 @@ SettingsDialog::addTabs()
         form->addRow("Theme color:", slider);
         form->addRow("Font:", font);
 
+        // theme
+        combo->addItem("White");
+        combo->addItem("Light");
+        combo->addItem("Dark");
+        combo->addItem("Black");
+
+        QString theme = settings.theme.get();
+        theme = theme.toLower();
+
+        if (theme == "light") {
+            combo->setCurrentIndex(0);
+        } else if (theme == "white") {
+            combo->setCurrentIndex(1);
+        } else if (theme == "black") {
+            combo->setCurrentIndex(3);
+        } else {
+            combo->setCurrentIndex(2);
+        }
+
+        QObject::connect(combo, &QComboBox::currentTextChanged, this,
+                         [this, &settings](const QString &value) {
+                             settings.theme.set(value);
+                         });
+
+        // theme hue
+        slider->setMinimum(0);
+        slider->setMaximum(1000);
+
+        float hue = settings.themeHue.get();
+
+        slider->setValue(std::min(std::max(hue, (float)0.0), (float)1.0) *
+                         1000);
+
+        QObject::connect(slider, &QSlider::valueChanged, this,
+                         [this, &settings](int value) {
+                             settings.themeHue.set(value / 1000.0);
+                             Windows::updateAll();
+                         });
+
         group->setLayout(form);
 
         vbox->addWidget(group);

windows.cpp

@@ -38,6 +38,14 @@ Windows::repaintVisibleChatWidgets(Channel *channel)
     }
 }
 
+void
+Windows::updateAll()
+{
+    if (Windows::mainWindow != nullptr) {
+        Windows::mainWindow->update();
+    }
+}
+
 void
 Windows::load()
 {

windows.h

@@ -12,6 +12,7 @@ class Windows
 public:
     static void layoutVisibleChatWidgets(Channel *channel = NULL);
     static void repaintVisibleChatWidgets(Channel *channel = NULL);
+    static void updateAll();
 
     static widgets::MainWindow &
     getMainWindow()