Merge pull request #1342 from yamanq/yamanq/custom_color

Allow setting custom color picker in userColors
2021-02-18 08:19:14 -06:00
parent da8f2840e6 3514c3cd82
commit 70609548ca
1 changed files with 7 additions and 1 deletions
--- a/src/utils/confighandler.cpp
+++ b/src/utils/confighandler.cpp
@@ -100,6 +100,8 @@ QVector<QColor> ConfigHandler::getUserColors()
             m_settings.value(QStringLiteral("userColors")).toStringList()) {
            if (QColor::isValidColor(hex)) {
                colors.append(QColor(hex));
+            } else if (hex == QStringLiteral("picker")) {
+                colors.append(QColor());
            }
        }

@@ -118,7 +120,11 @@ void ConfigHandler::setUserColors(const QVector<QColor>& l)
    QStringList hexColors;

    for (const QColor& color : l) {
-        hexColors.append(color.name());
+        if (color.isValid()) {
+            hexColors.append(color.name());
+        } else {
+            hexColors.append(QStringLiteral("picker"));
+        }
    }

    m_settings.setValue(QStringLiteral("userColors"),