From 2e38fd0deb460a3c1b540fdc22d9ecb22bf462be Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 18 Jan 2025 00:52:27 +0100 Subject: [PATCH] Initialize palette field in icon manager This doesn't make a difference right now but in generall it is better to have the field initialized from the beginning (in accordance to the palette that is determined anyway for making ForkAwesome icons). --- syncthingmodel/syncthingicons.cpp | 6 +++--- syncthingmodel/syncthingicons.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/syncthingmodel/syncthingicons.cpp b/syncthingmodel/syncthingicons.cpp index 20cfde53..e055b072 100644 --- a/syncthingmodel/syncthingicons.cpp +++ b/syncthingmodel/syncthingicons.cpp @@ -340,10 +340,10 @@ ForkAwesomeIcons::ForkAwesomeIcons(QtForkAwesome::Renderer &renderer, const QCol } IconManager::IconManager(const QPalette *palette) - : m_statusIcons() + : m_palette(palette ? *palette : QGuiApplication::palette()) + , m_statusIcons() , m_trayIcons(m_statusIcons) - , m_commonForkAwesomeIcons( - m_forkAwesomeRenderer, (palette ? *palette : QGuiApplication::palette()).color(QPalette::Normal, QPalette::Text), QSize(64, 64)) + , m_commonForkAwesomeIcons(m_forkAwesomeRenderer, m_palette.color(QPalette::Normal, QPalette::Text), QSize(64, 64)) , m_distinguishTrayIcons(false) { m_forkAwesomeRenderer.warnIfInvalid(); diff --git a/syncthingmodel/syncthingicons.h b/syncthingmodel/syncthingicons.h index 4d4889d5..7c2bd6a4 100644 --- a/syncthingmodel/syncthingicons.h +++ b/syncthingmodel/syncthingicons.h @@ -185,11 +185,11 @@ public Q_SLOTS: private: explicit IconManager(const QPalette *palette = nullptr); + QPalette m_palette; StatusIcons m_statusIcons; StatusIcons m_trayIcons; QtForkAwesome::Renderer m_forkAwesomeRenderer; ForkAwesomeIcons m_commonForkAwesomeIcons; - QPalette m_palette; std::optional m_paletteBasedSettingsForStatus; std::optional m_paletteBasedSettingsForTray; bool m_distinguishTrayIcons;