diff options
| author | Nikita Krupenko <krnekit@gmail.com> | 2016-04-14 01:41:05 +0300 |
|---|---|---|
| committer | Nikita Krupenko <krnekit@gmail.com> | 2016-04-26 12:10:36 +0000 |
| commit | 0535acbdddb172268a8a58729c539dd6ba7c3d2f (patch) | |
| tree | 70bfd76ade4ca725a6caa538eb22958f8c5eaf11 /src/imports/controls/material/qquickmaterialtheme.cpp | |
| parent | c9bb4d328359ca24a70eb1ed981de85c7bb1846c (diff) | |
Use ToolTip font from theme
Change-Id: I9a95bcd02a48528bc3e3315c7aa730a2d43bb002
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialtheme.cpp')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialtheme.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp index 1f3bba49..379a30fc 100644 --- a/src/imports/controls/material/qquickmaterialtheme.cpp +++ b/src/imports/controls/material/qquickmaterialtheme.cpp @@ -52,6 +52,7 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) const QString family = font.family(); systemFont.setFamily(family); buttonFont.setFamily(family); + toolTipFont.setFamily(family); itemViewFont.setFamily(family); listViewFont.setFamily(family); menuItemFont.setFamily(family); @@ -64,6 +65,9 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) buttonFont.setCapitalization(QFont::AllUppercase); buttonFont.setWeight(QFont::Medium); + toolTipFont.setPixelSize(14); + toolTipFont.setWeight(QFont::Medium); + itemViewFont.setPixelSize(14); itemViewFont.setWeight(QFont::Medium); @@ -81,6 +85,8 @@ const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const case QPlatformTheme::PushButtonFont: case QPlatformTheme::ToolButtonFont: return &buttonFont; + case QPlatformTheme::TipLabelFont: + return &toolTipFont; case QPlatformTheme::ItemViewFont: return &itemViewFont; case QPlatformTheme::ListViewFont: |