diff options
| author | Doris Verria <doris.verria@qt.io> | 2025-11-27 17:53:53 +0100 |
|---|---|---|
| committer | Doris Verria <doris.verria@qt.io> | 2025-12-01 13:03:28 +0100 |
| commit | caeaa6bdd10d1d5b2bcd3b59f629583905197267 (patch) | |
| tree | a06bea62a507686de54f428168b858f1509bdb77 /src/labs/stylekit/qqstylekitstyle_p.h | |
| parent | 49f14263cd587282f77b0fac761de74483e52485 (diff) | |
Add a fonts property to the style that allows you to set fonts per
control, similarily to what we do in QQuickTheme.
The fonts are propagated from the style to the theme, and from the
fallback style to the style. That means that if a font is not set
for a theme or style, it will be resolved against its fallback font.
Since both the QQStyleKitTheme and QQStyleKitStyle should have a
fonts property, introduce a common base class: QQStyleKitThemeProperties
that contains the fonts property. Later, the palettes can be moved
there as well.
Also add a font property to the QQStyleKitReader that is suposed to
return the font for the current control being read.
Change-Id: I116c1ab9bc426570756476ee409513587c475a0d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/labs/stylekit/qqstylekitstyle_p.h')
| -rw-r--r-- | src/labs/stylekit/qqstylekitstyle_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/labs/stylekit/qqstylekitstyle_p.h b/src/labs/stylekit/qqstylekitstyle_p.h index ac560f7b88..2aba7ddbf5 100644 --- a/src/labs/stylekit/qqstylekitstyle_p.h +++ b/src/labs/stylekit/qqstylekitstyle_p.h @@ -20,6 +20,7 @@ #include "qqstylekitcontrols_p.h" #include "qqstylekitcustomtheme_p.h" #include "qqstylekitdebug_p.h" +#include "qqstylekitstyleandthemebase_p.h" #include <QtQml/QtQml> #include <QtQuickTemplates2/private/qquickdeferredpointer_p_p.h> @@ -29,7 +30,7 @@ QT_BEGIN_NAMESPACE class QQStyleKitTheme; class QQStyleKitPropertyResolver; -class QQStyleKitStyle : public QQStyleKitControls +class QQStyleKitStyle : public QQStyleKitStyleAndThemeBase { Q_OBJECT Q_PROPERTY(QQuickPalette *palette READ palette NOTIFY paletteChanged FINAL) @@ -76,6 +77,8 @@ public: static QQStyleKitStyle *current(); + QFont fontForReader(QQStyleKitReader *reader) const; + // For now, used by qqcontrolstowidgetstyle Q_INVOKABLE QList<QObject *> customThemesAsList(); |