the rewrite that nobody wanted

2018-01-02 02:15:11 +01:00
parent 0ef08378cc
commit 3e5937011a
18 changed files with 217 additions and 175 deletions
@@ -22,65 +22,79 @@ public:
        return this->lightTheme;
    }

-    QString InputStyleSheet;
+    struct TabColors {
+        QColor text;
+        struct Backgrounds {
+            QBrush regular;
+            QBrush hover;
+            QBrush unfocused;
+        } backgrounds;
+    };

-    QColor SystemMessageColor;
+    struct Tabs {
+        TabColors regular;
+        TabColors selected;
+        TabColors highlighted;
+        TabColors newMessage;
+    } tabs;

-    QColor DropPreviewBackground;
+    struct Splits {
+        QColor messageSeperator;
+        QColor background;
+        QColor border;
+        QColor borderFocused;
+        QColor dropPreview;

-    QColor TooltipBackground;
-    QColor TooltipText;
+        struct Header {
+            QColor border;
+            QColor background;
+            QColor text;
+            // int margin;
+        } header;

-    QColor ChatSeperator;
-    QColor ChatBackground;
-    QColor ChatBackgroundHighlighted;
-    QColor ChatBackgroundResub;
-    QColor ChatBackgroundWhisper;
-    QColor DisabledMessageOverlay;
+        struct Input {
+            QColor border;
+            QColor background;
+            QColor selection;
+            QColor text;
+            QString styleSheet;
+            // int margin;
+        } input;
+    } splits;

-    QColor ChatHeaderBorder;
-    QColor ChatHeaderBackground;
+    struct Messages {
+        struct TextColors {
+            QColor regular;
+            QColor caret;
+            QColor link;
+            QColor system;
+        } textColors;

-    QColor ChatInputBackground;
-    QColor ChatInputBorder;
+        struct Backgrounds {
+            QColor regular;
+            QColor highlighted;
+            // QColor resub;
+            // QColor whisper;
+        } backgrounds;

-    QColor ChatMessageSeperatorBorder;
-    QColor ChatMessageSeperatorBorderInner;
-    QColor ChatBorder;
-    QColor ChatBorderFocused;
-    QColor Text;
-    QColor TextCaret;
-    QColor TextLink;
-    QColor TextFocused;
-    QColor Menu;
-    QColor MenuBorder;
+        QColor disabled;
+        //        QColor seperator;
+        //        QColor seperatorInner;
+        QColor selection;
+    } messages;

-    QColor ScrollbarBG;
-    QColor ScrollbarThumb;
-    QColor ScrollbarThumbSelected;
-    QColor ScrollbarArrow;
+    struct Scrollbars {
+        QColor background;
+        QColor thumb;
+        QColor thumbSelected;
+        // const int highlightsCount = 3;
+        // QColor highlights[3];
+    } scrollbars;

-    QColor TabText;
-    QColor TabBackground;
-
-    QColor TabHoverText;
-    QColor TabHoverBackground;
-
-    QColor TabSelectedText;
-    QColor TabSelectedBackground;
-
-    QColor TabHighlightedText;
-    QColor TabHighlightedBackground;
-
-    QColor TabSelectedUnfocusedText;
-    QColor TabSelectedUnfocusedBackground;
-
-    QBrush TabNewMessageBackground;
-
-    QColor Selection;
-
-    const int HighlightColorCount = 3;
-    QColor HighlightColors[3];
+    struct Tooltip {
+        QColor text;
+        QColor background;
+    } tooltip;

    void normalizeColor(QColor &color);