Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix auto-detection of dark color theme in Plasmoid 

* Remove `0 &&` in condition for making `QPalette` from Plasma theme
* Set `WindowText`/`Window` of `QPalette` in legacy case so
  `isPaletteDark()` works
* Set the icon manager's palette from the beginning (and not only if the
  Plasma theme changes)
This commit is contained in:
Martchus 2022-09-05 22:18:41 +02:00
parent 2e961c489d
commit 8ea158aa23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plasmoid/lib/syncthingapplet.cpp
View File

@ -55,11 +55,13 @@ namespace Plasmoid {
static inline QPalette paletteFromTheme(const Plasma::Theme &theme)
{
#if 0 && PLASMA_VERSION_MAJOR >= 5 && PLASMA_VERSION_MINOR >= 68
#if PLASMA_VERSION_MAJOR >= 5 && PLASMA_VERSION_MINOR >= 68
return theme.palette();
#else
auto p = QPalette();
p.setColor(QPalette::Normal, QPalette::Text, theme.color(Plasma::Theme::TextColor));
p.setColor(QPalette::Normal, QPalette::WindowText, theme.color(Plasma::Theme::TextColor));
p.setColor(QPalette::Normal, QPalette::Window, theme.color(Plasma::Theme::BackgroundColor));
return p;
#endif
}
@ -149,7 +151,9 @@ void SyncthingApplet::init()
m_currentConnectionConfig = config().readEntry<int>("selectedConfig", 0);
// apply settings and connect according to settings
setBrightColors(isPaletteDark(paletteFromTheme(m_theme)));
const auto palette = paletteFromTheme(m_theme);
setBrightColors(isPaletteDark(palette));
IconManager::instance().setPalette(palette);
handleSettingsChanged();
m_initialized = true;