diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2018-12-30 20:34:29 -0600 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-30 20:34:29 -0600 |
| commit | 398cc0112e79e7e70668531ec41382040d2d587b (patch) | |
| tree | 47981d46a285319fd8a8fb648a4778cd6a9ab66e /src/settings.cpp | |
| parent | 580f45429fca07a4d3cd8daae83b6963ce5de54a (diff) | |
| parent | 4809c301324b5ebcdad4146325023f53d20d05d8 (diff) | |
Merge branch 'Develop' into archive_conflicts_2
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 3202dffe..6d16cfc6 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -197,9 +197,12 @@ QString Settings::deObfuscate(const QString &password) return QString::fromUtf8(buffer.constData()); } -QColor Settings::getIdealTextColor(const QColor& rBackgroundColor) +QColor Settings::getIdealTextColor(const QColor& rBackgroundColor) { - const int THRESHOLD = 106; + if (rBackgroundColor.alpha() == 0) + return QColor(Qt::black); + + const int THRESHOLD = 106 * 255.0f / rBackgroundColor.alpha(); int BackgroundDelta = (rBackgroundColor.red() * 0.299) + (rBackgroundColor.green() * 0.587) + (rBackgroundColor.blue() * 0.114); return QColor((255 - BackgroundDelta <= THRESHOLD) ? Qt::black : Qt::white); } @@ -795,24 +798,12 @@ Settings::GeneralTab::GeneralTab(Settings *m_parent, SettingsDialog &m_dialog) */ //version with stylesheet - m_overwritingBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg( - m_parent->modlistOverwritingLooseColor().name()).arg(getIdealTextColor( - m_parent->modlistOverwritingLooseColor()).name())); - m_overwrittenBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg( - m_parent->modlistOverwrittenLooseColor().name()).arg(getIdealTextColor( - m_parent->modlistOverwrittenLooseColor()).name())); - m_overwritingArchiveBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg( - m_parent->modlistOverwritingArchiveColor().name()).arg(getIdealTextColor( - m_parent->modlistOverwritingArchiveColor()).name())); - m_overwrittenArchiveBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg( - m_parent->modlistOverwrittenArchiveColor().name()).arg(getIdealTextColor( - m_parent->modlistOverwrittenArchiveColor()).name())); - m_containsBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg( - m_parent->modlistContainsPluginColor().name()).arg(getIdealTextColor( - m_parent->modlistContainsPluginColor()).name())); - m_containedBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg( - m_parent->pluginListContainedColor().name()).arg(getIdealTextColor( - m_parent->pluginListContainedColor()).name())); + m_dialog.setButtonColor(m_overwritingBtn, m_parent->modlistOverwritingLooseColor()); + m_dialog.setButtonColor(m_overwrittenBtn, m_parent->modlistOverwrittenLooseColor()); + m_dialog.setButtonColor(m_overwritingArchiveBtn, m_parent->modlistOverwritingArchiveColor()); + m_dialog.setButtonColor(m_overwrittenArchiveBtn, m_parent->modlistOverwrittenArchiveColor()); + m_dialog.setButtonColor(m_containsBtn, m_parent->modlistContainsPluginColor()); + m_dialog.setButtonColor(m_containedBtn, m_parent->pluginListContainedColor()); m_dialog.setOverwritingColor(m_parent->modlistOverwritingLooseColor()); m_dialog.setOverwrittenColor(m_parent->modlistOverwrittenLooseColor()); |