Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2019-10-14 15:12:03 +0300
committerOlivier Goffart <ogoffart@woboq.com>2019-10-14 15:12:03 +0300
commit292e983d7c36a503f7452d53cfc8b1fedb03b9a6 (patch)
tree5fdcb56919ae33c184296b616428f7d7932b5fc6 /src/gui/settingsdialog.cpp
parent970331c531490f7aadbd262c87b09363a3d5cf2a (diff)
parent8d3c1a18ca62e5fd3176b34e3870a8b503396757 (diff)
Merge remote-tracking branch 'origin/2.6' into master
Diffstat (limited to 'src/gui/settingsdialog.cpp')
-rw-r--r--src/gui/settingsdialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 7db6ba955..a444a4a25 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -320,10 +320,10 @@ void SettingsDialog::accountRemoved(AccountState *s)
void SettingsDialog::customizeStyle()
{
QString highlightColor(palette().highlight().color().name());
- QString altBase(palette().alternateBase().color().name());
+ QString highlightTextColor(palette().highlightedText().color().name());
QString dark(palette().dark().color().name());
QString background(palette().base().color().name());
- _toolBar->setStyleSheet(QString::fromLatin1(TOOLBAR_CSS).arg(background, dark, highlightColor, altBase));
+ _toolBar->setStyleSheet(QString::fromLatin1(TOOLBAR_CSS).arg(background, dark, highlightColor, highlightTextColor));
Q_FOREACH (QAction *a, _actionGroup->actions()) {
QIcon icon = createColorAwareIcon(a->property("iconPath").toString());