Use fonts from theme for editable controls

Also set proper fonts for editable controls in Material theme.

Change-Id: I78b8f8597a653af593787e569d6ba5ee7bf182a9
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp
index afe6bf65..8fdc912c 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/imports/controls/material/qquickmaterialtheme.cpp
@@ -53,6 +53,7 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
         buttonFont.setFamily(font.family());
         itemViewFont.setFamily(font.family());
         menuItemFont.setFamily(font.family());
+        editorFont.setFamily(font.family());
     }
 
     systemFont.setPixelSize(14);
@@ -65,6 +66,8 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
     itemViewFont.setWeight(QFont::Medium);
 
     menuItemFont.setPixelSize(16);
+
+    editorFont.setPixelSize(16);
 }
 
 const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const
@@ -79,6 +82,8 @@ const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const
     case QPlatformTheme::MenuItemFont:
     case QPlatformTheme::ComboMenuItemFont:
         return &menuItemFont;
+    case QPlatformTheme::EditorFont:
+        return &editorFont;
     default:
         return &systemFont;
     }