From e5370d171d2bf5e15ab8eba9e3785b4f55256bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Mon, 17 Jun 2019 19:42:17 +0200 Subject: [PATCH] Fix def. Cutter specific Colors for Custom Themes (#1606) --- src/common/ColorThemeWorker.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/ColorThemeWorker.cpp b/src/common/ColorThemeWorker.cpp index 9a932a3b..b890b3a6 100644 --- a/src/common/ColorThemeWorker.cpp +++ b/src/common/ColorThemeWorker.cpp @@ -178,8 +178,13 @@ QJsonDocument ColorThemeWorker::getTheme(const QString& themeName) const theme[it.key()] = QJsonArray({r, g, b, a}); } + ColorFlags colorFlags = ColorFlags::DarkFlag; + if (Configuration::relevantThemes.contains(themeName)) { + colorFlags = Configuration::relevantThemes[themeName]; + } + for (auto& it : cutterSpecificOptions) { - Configuration::cutterOptionColors[it][Configuration::relevantThemes[themeName]].getRgb(&r, &g, &b, &a); + Configuration::cutterOptionColors[it][colorFlags].getRgb(&r, &g, &b, &a); theme.insert(it, QJsonArray{r, g, b, a}); }