diff options
| author | Doris Verria <doris.verria@qt.io> | 2025-12-08 13:09:56 +0100 |
|---|---|---|
| committer | Doris Verria <doris.verria@qt.io> | 2025-12-18 14:07:18 +0100 |
| commit | ca3912d549c7d121745476b8cb096b51a4defeb4 (patch) | |
| tree | a20145be6e38ce775fc71e49ea1694bb5148e1ac /src/labs/stylekit/qqstylekitstyle.cpp | |
| parent | 415706f174377052b0c1e5e101fb4e37a9b159f3 (diff) | |
StyleKit: Move palettes from QQuickTheme to parent class
Task-number: QTBUG-130067
Pick-to: 6.11
Change-Id: Ie9c466591fbfbf54d9575d3684636b13c1061d64
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/labs/stylekit/qqstylekitstyle.cpp')
| -rw-r--r-- | src/labs/stylekit/qqstylekitstyle.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/labs/stylekit/qqstylekitstyle.cpp b/src/labs/stylekit/qqstylekitstyle.cpp index cef89604dd..9c001b5beb 100644 --- a/src/labs/stylekit/qqstylekitstyle.cpp +++ b/src/labs/stylekit/qqstylekitstyle.cpp @@ -60,11 +60,12 @@ void QQStyleKitStyle::setFallbackStyle(QQStyleKitStyle *fallbackStyle) m_fallbackStyle = fallbackStyle; emit fallbackStyleChanged(); + if (palettes()) + palettes()->setFallbackPalette(m_fallbackStyle ? m_fallbackStyle->palettes() : nullptr); + if (fonts()) fonts()->setFallbackFont(m_fallbackStyle ? m_fallbackStyle->fonts() : nullptr); - if (m_theme && m_theme->fonts()) - m_theme->fonts()->setFallbackFont(fonts()); } void QQStyleKitStyle::setLight(QQmlComponent *lightTheme) @@ -237,14 +238,12 @@ void QQStyleKitStyle::recreateTheme() m_theme->setParent(this); } - if (m_theme && m_theme->fonts()) + if (m_theme->fonts()) m_theme->fonts()->setFallbackFont(fonts()); + if (m_theme->palettes()) + m_theme->palettes()->setFallbackPalette(palettes()); if (this == current()) { m_theme->updateQuickTheme(); - if (m_theme->fonts()) - m_theme->fonts()->setFallbackFont(fonts()); - if (fonts()) - fonts()->setFallbackFont(m_fallbackStyle ? m_fallbackStyle->fonts() : nullptr); QQStyleKitReader::resetAll(); } |