diff options
author | Nikita Krupenko <krnekit@gmail.com> | 2016-04-14 01:08:16 +0300 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-14 09:22:46 +0000 |
commit | ed9720ffc6b462889e2f501824e9656a6ffde313 (patch) | |
tree | 91209d14e5442ffe68747ffbf62033f8be5b3c78 /src/imports | |
parent | e2ee646a3f25f7fe0767d9af2beafe33b31cc07a (diff) |
Use font from theme for list delegates
Change-Id: I48208fb6b5f7df6e1e824d36a256d9b1643cd16d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/controls/material/qquickmaterialtheme.cpp | 5 | ||||
-rw-r--r-- | src/imports/controls/material/qquickmaterialtheme_p.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp index 66febc28..1f3bba49 100644 --- a/src/imports/controls/material/qquickmaterialtheme.cpp +++ b/src/imports/controls/material/qquickmaterialtheme.cpp @@ -53,6 +53,7 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) systemFont.setFamily(family); buttonFont.setFamily(family); itemViewFont.setFamily(family); + listViewFont.setFamily(family); menuItemFont.setFamily(family); editorFont.setFamily(family); } @@ -66,6 +67,8 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) itemViewFont.setPixelSize(14); itemViewFont.setWeight(QFont::Medium); + listViewFont.setPixelSize(16); + menuItemFont.setPixelSize(16); editorFont.setPixelSize(16); @@ -80,6 +83,8 @@ const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const return &buttonFont; case QPlatformTheme::ItemViewFont: return &itemViewFont; + case QPlatformTheme::ListViewFont: + return &listViewFont; case QPlatformTheme::MenuItemFont: case QPlatformTheme::ComboMenuItemFont: return &menuItemFont; diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index 92842675..8739a756 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -64,6 +64,7 @@ private: QFont systemFont; QFont buttonFont; QFont itemViewFont; + QFont listViewFont; QFont menuItemFont; QFont editorFont; }; |