1 files changed, 26 insertions, 4 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp
index 4124735a..c373c61b 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/imports/controls/material/qquickmaterialtheme.cpp
@@ -50,11 +50,23 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
 
     if (font.exactMatch()) {
         systemFont.setFamily(font.family());
-        tabButtonFont.setFamily(font.family());
+        buttonFont.setFamily(font.family());
+        toolButtonFont.setFamily(font.family());
+        itemViewFont.setFamily(font.family());
+        menuItemFont.setFamily(font.family());
     }
 
-    tabButtonFont.setPixelSize(14);
-    tabButtonFont.setCapitalization(QFont::AllUppercase);
+    buttonFont.setPixelSize(14);
+    buttonFont.setCapitalization(QFont::AllUppercase);
+    buttonFont.setWeight(QFont::Medium);
+
+    toolButtonFont.setPixelSize(14);
+    toolButtonFont.setCapitalization(QFont::AllUppercase);
+
+    itemViewFont.setPixelSize(14);
+    itemViewFont.setWeight(QFont::Medium);
+
+    menuItemFont.setPixelSize(16);
 }
 
 QQuickMaterialTheme::~QQuickMaterialTheme()
@@ -65,7 +77,17 @@ const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const
 {
     switch (type) {
     case QPlatformTheme::TabButtonFont:
-        return &tabButtonFont;
+    case QPlatformTheme::PushButtonFont:
+        return &buttonFont;
+    case QPlatformTheme::ToolButtonFont:
+        return &toolButtonFont;
+    case QPlatformTheme::ItemViewFont:
+        return &itemViewFont;
+    case QPlatformTheme::MenuItemFont:
+    case QPlatformTheme::ComboMenuItemFont:
+    case QPlatformTheme::CheckBoxFont:
+    case QPlatformTheme::RadioButtonFont:
+        return &menuItemFont;
     default:
         return &systemFont;
     }