refactored the managers

2017-12-31 00:50:07 +01:00
parent 258288bad9
commit bfa2f1637e
80 changed files with 1023 additions and 964 deletions
@@ -1,5 +1,5 @@
 #include "widgets/helper/scrollbarhighlight.hpp"
-#include "colorscheme.hpp"
+#include "singletons/thememanager.hpp"
 #include "widgets/scrollbar.hpp"

 namespace chatterino {
@@ -7,9 +7,9 @@ namespace widgets {

 ScrollBarHighlight::ScrollBarHighlight(double _position, int _colorIndex, ScrollBar *parent,
                                       Style _style, QString _tag)
-    : colorScheme(parent->colorScheme)
+    : themeManager(parent->themeManager)
    , position(_position)
-    , colorIndex(std::max(0, std::min(this->colorScheme.HighlightColorCount, _colorIndex)))
+    , colorIndex(std::max(0, std::min(this->themeManager.HighlightColorCount, _colorIndex)))
    , style(_style)
    , tag(_tag)
 {