From 08ae43e88ea7cc521d3a1d53ab6e3c7b104b7235 Mon Sep 17 00:00:00 2001 From: nerix Date: Wed, 29 Mar 2023 10:21:35 +0200 Subject: [PATCH] Add Placeholder Color in Palette (#4477) Co-authored-by: pajlada --- CHANGELOG.md | 1 + src/RunGui.cpp | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b7b879fc..df14b5853 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Bugfix: Fixed an issue where context-menu items for zero-width emotes displayed the wrong provider. (#4460) - Bugfix: Fixed an issue where the "Enable zero-width emotes" setting was showing the inverse state. (#4462) - Bugfix: Fixed username rendering in Qt 6. (#4476) +- Bugfix: Fixed placeholder color in Qt 6. (#4477) - Bugfix: Fixed blocked user list being empty when opening the settings dialog for the first time. (#4437) - Bugfix: Fixed blocked user list sticking around when switching from a logged in user to being logged out. (#4437) - Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472) diff --git a/src/RunGui.cpp b/src/RunGui.cpp index 49c800a69..1f08d1a64 100644 --- a/src/RunGui.cpp +++ b/src/RunGui.cpp @@ -44,28 +44,30 @@ namespace { dark.setColor(QPalette::Window, QColor(22, 22, 22)); dark.setColor(QPalette::WindowText, Qt::white); dark.setColor(QPalette::Text, Qt::white); - dark.setColor(QPalette::Disabled, QPalette::WindowText, - QColor(127, 127, 127)); dark.setColor(QPalette::Base, QColor("#333")); dark.setColor(QPalette::AlternateBase, QColor("#444")); dark.setColor(QPalette::ToolTipBase, Qt::white); dark.setColor(QPalette::ToolTipText, Qt::white); - dark.setColor(QPalette::Disabled, QPalette::Text, - QColor(127, 127, 127)); dark.setColor(QPalette::Dark, QColor(35, 35, 35)); dark.setColor(QPalette::Shadow, QColor(20, 20, 20)); dark.setColor(QPalette::Button, QColor(70, 70, 70)); dark.setColor(QPalette::ButtonText, Qt::white); - dark.setColor(QPalette::Disabled, QPalette::ButtonText, - QColor(127, 127, 127)); dark.setColor(QPalette::BrightText, Qt::red); dark.setColor(QPalette::Link, QColor(42, 130, 218)); dark.setColor(QPalette::Highlight, QColor(42, 130, 218)); + dark.setColor(QPalette::HighlightedText, Qt::white); + dark.setColor(QPalette::PlaceholderText, QColor(127, 127, 127)); + dark.setColor(QPalette::Disabled, QPalette::Highlight, QColor(80, 80, 80)); - dark.setColor(QPalette::HighlightedText, Qt::white); dark.setColor(QPalette::Disabled, QPalette::HighlightedText, QColor(127, 127, 127)); + dark.setColor(QPalette::Disabled, QPalette::ButtonText, + QColor(127, 127, 127)); + dark.setColor(QPalette::Disabled, QPalette::Text, + QColor(127, 127, 127)); + dark.setColor(QPalette::Disabled, QPalette::WindowText, + QColor(127, 127, 127)); qApp->setPalette(dark); }