From c27127244ea617fb5a5e96a0c5c15dd19b89a704 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Mon, 30 Sep 2024 11:48:10 +0200 Subject: [PATCH] chore: remove unused overlay theme keys These weren't used, but I'd like to have something like this in the future. Not eaxactly sure what the api should be (settings/theme) --- docs/ChatterinoTheme.schema.json | 9 +-------- resources/themes/Black.json | 7 ------- resources/themes/Dark.json | 7 ------- resources/themes/Light.json | 7 ------- resources/themes/White.json | 7 ------- src/singletons/Theme.cpp | 3 --- src/singletons/Theme.hpp | 1 - 7 files changed, 1 insertion(+), 40 deletions(-) diff --git a/docs/ChatterinoTheme.schema.json b/docs/ChatterinoTheme.schema.json index 7e23e73a2a3..e00332392a4 100644 --- a/docs/ChatterinoTheme.schema.json +++ b/docs/ChatterinoTheme.schema.json @@ -293,19 +293,12 @@ "backgrounds": { "$ref": "#/definitions/message-backgrounds" }, "disabled": { "$ref": "#/definitions/qt-color" }, "selection": { "$ref": "#/definitions/qt-color" }, - "textColors": { "$ref": "#/definitions/text-colors" }, "background": { "$ref": "#/definitions/qt-color", "description": "Note: The alpha value is ignored (set through the settings)" } }, - "required": [ - "backgrounds", - "disabled", - "selection", - "textColors", - "background" - ] + "required": ["backgrounds", "disabled", "selection", "background"] }, "scrollbars": { "type": "object", diff --git a/resources/themes/Black.json b/resources/themes/Black.json index c194aa793ad..6263a54927c 100644 --- a/resources/themes/Black.json +++ b/resources/themes/Black.json @@ -29,13 +29,6 @@ }, "disabled": "#64000000", "selection": "#40ffffff", - "textColors": { - "caret": "#ffffff", - "chatPlaceholder": "#5d5555", - "link": "#4286f4", - "regular": "#ffffff", - "system": "#8c7f7f" - }, "background": "#000" }, "scrollbars": { diff --git a/resources/themes/Dark.json b/resources/themes/Dark.json index 2b85545d766..875fb2754b0 100644 --- a/resources/themes/Dark.json +++ b/resources/themes/Dark.json @@ -29,13 +29,6 @@ }, "disabled": "#64000000", "selection": "#40ffffff", - "textColors": { - "caret": "#ffffff", - "chatPlaceholder": "#5d5555", - "link": "#4286f4", - "regular": "#ffffff", - "system": "#8c7f7f" - }, "background": "#000" }, "scrollbars": { diff --git a/resources/themes/Light.json b/resources/themes/Light.json index d9a4c2c28a7..0a40b1b0842 100644 --- a/resources/themes/Light.json +++ b/resources/themes/Light.json @@ -29,13 +29,6 @@ }, "disabled": "#64ffffff", "selection": "#40ffffff", - "textColors": { - "caret": "#000000", - "chatPlaceholder": "#af9f9f", - "link": "#4286f4", - "regular": "#000000", - "system": "#8c7f7f" - }, "background": "#fff" }, "scrollbars": { diff --git a/resources/themes/White.json b/resources/themes/White.json index 46953ba9580..0151041fa12 100644 --- a/resources/themes/White.json +++ b/resources/themes/White.json @@ -29,13 +29,6 @@ }, "disabled": "#64ffffff", "selection": "#40ffffff", - "textColors": { - "caret": "#000000", - "chatPlaceholder": "#af9f9f", - "link": "#4286f4", - "regular": "#000000", - "system": "#8c7f7f" - }, "background": "#fff" }, "scrollbars": { diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp index 0c29d429ca2..ecc317b301f 100644 --- a/src/singletons/Theme.cpp +++ b/src/singletons/Theme.cpp @@ -157,9 +157,6 @@ void parseOverlayMessages(const QJsonObject &overlayMessages, const QJsonObject &overlayMessagesFallback, chatterino::Theme &theme) { - parseTextColors(overlayMessages["textColors"_L1].toObject(), - overlayMessagesFallback["textColors"_L1].toObject(), - theme.overlayMessages); parseMessageBackgrounds( overlayMessages["backgrounds"_L1].toObject(), overlayMessagesFallback["backgrounds"_L1].toObject(), diff --git a/src/singletons/Theme.hpp b/src/singletons/Theme.hpp index ac9fa070c1d..a9528094e55 100644 --- a/src/singletons/Theme.hpp +++ b/src/singletons/Theme.hpp @@ -108,7 +108,6 @@ class Theme final } messages; struct { - TextColors textColors; MessageBackgrounds backgrounds; QColor disabled;