Cleanup and unify font handling

First of all, move the remaining user requested fonts to ExtraData.
This was done for QQuickControl, but not for the controls that do not
inherit QQuickControl: QQuickLabel, QQuickTextField & QQuickTextArea.
The ExtraData starts really paying off later when introducing palettes
that propagate similarly to fonts.

Furthermore, give a more explicit name ('font' vs. 'requestedFont')
for the user requested fonts. This lets us use 'font' (instead of just
'f') as an argument name in those various font-helper methods in the
private classes. Furthermore, sync QQuickLabel|TextField|TextArea's
font handling with QQuickControl. It would be best to share the code
somehow, but it's quite tricky due to different base classes, font
members ('resolvedFont' vs. 'sourceFont'), and notifier signals.

Change-Id: I50cc1af160bb033ae604b4239e438c083d83f15d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index a6825640..3cd04b17 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -101,15 +101,15 @@ public:
     QAccessible::Role accessibleRole() const override;
 #endif
 
-    void updateFont(const QFont &f);
-    static void updateFontRecur(QQuickItem *item, const QFont &f);
-    inline void setFont_helper(const QFont &f) {
-        if (resolvedFont.resolve() == f.resolve() && resolvedFont == f)
+    virtual void resolveFont();
+    void inheritFont(const QFont &font);
+    void updateFont(const QFont &font);
+    static void updateFontRecur(QQuickItem *item, const QFont &font);
+    inline void setFont_helper(const QFont &font) {
+        if (resolvedFont.resolve() == font.resolve() && resolvedFont == font)
             return;
-        updateFont(f);
+        updateFont(font);
     }
-    virtual void resolveFont();
-    void inheritFont(const QFont &f);
     static QFont parentFont(const QQuickItem *item);
     static QFont themeFont(QPlatformTheme::Font type);
 
@@ -127,11 +127,10 @@ public:
 
     struct ExtraData {
         ExtraData();
-        QFont font;
+        QFont requestedFont;
     };
     QLazilyAllocated<ExtraData> extra;
 
-    QFont resolvedFont;
     bool hasTopPadding;
     bool hasLeftPadding;
     bool hasRightPadding;
@@ -150,6 +149,7 @@ public:
     qreal bottomPadding;
     qreal spacing;
     QLocale locale;
+    QFont resolvedFont;
     Qt::FocusPolicy focusPolicy;
     Qt::FocusReason focusReason;
     QQuickItem *background;