Merge pull request #1360 from namecheap/bugfix/nc_custom-color-is-always-black
Custom color is always black
This commit is contained in:
@@ -117,22 +117,6 @@ QVector<QColor> ConfigHandler::getUserColors()
|
||||
return colors;
|
||||
}
|
||||
|
||||
void ConfigHandler::setUserColors(const QVector<QColor>& l)
|
||||
{
|
||||
QStringList hexColors;
|
||||
|
||||
for (const QColor& color : l) {
|
||||
if (color.isValid()) {
|
||||
hexColors.append(color.name());
|
||||
} else {
|
||||
hexColors.append(QStringLiteral("picker"));
|
||||
}
|
||||
}
|
||||
|
||||
m_settings.setValue(QStringLiteral("userColors"),
|
||||
QVariant::fromValue(hexColors));
|
||||
}
|
||||
|
||||
QString ConfigHandler::savePath()
|
||||
{
|
||||
return m_settings.value(QStringLiteral("savePath")).toString();
|
||||
@@ -301,7 +285,7 @@ int ConfigHandler::drawThicknessValue()
|
||||
return res;
|
||||
}
|
||||
|
||||
void ConfigHandler::setdrawThickness(const int thickness)
|
||||
void ConfigHandler::setDrawThickness(const int thickness)
|
||||
{
|
||||
m_settings.setValue(QStringLiteral("drawThickness"), thickness);
|
||||
}
|
||||
|
||||
@@ -32,7 +32,6 @@ public:
|
||||
void setButtons(const QVector<CaptureToolButton::ButtonType>&);
|
||||
|
||||
QVector<QColor> getUserColors();
|
||||
void setUserColors(const QVector<QColor>&);
|
||||
|
||||
QString savePath();
|
||||
void setSavePath(const QString&);
|
||||
@@ -65,7 +64,7 @@ public:
|
||||
void setDisabledTrayIcon(const bool);
|
||||
|
||||
int drawThicknessValue();
|
||||
void setdrawThickness(const int);
|
||||
void setDrawThickness(const int);
|
||||
|
||||
bool keepOpenAppLauncherValue();
|
||||
void setKeepOpenAppLauncher(const bool);
|
||||
|
||||
Reference in New Issue
Block a user