diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-20 07:30:41 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-20 07:36:55 +0100 |
commit | 7116f3959c9ade06397de9df66d66667a1a703fe (patch) | |
tree | 2b5eae5581d1d8750ece6195f9d7b337ccc32130 /src/imports | |
parent | d475ba88cc7e0875cfc30371867d7b82f006770f (diff) | |
parent | 20b60be518f05611fb11a98b57e73f6bb6c8b46e (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickapplicationwindow.cpp
src/templates/qquickcontrol_p.h
src/templates/qquickpage.cpp
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p_p.h
Change-Id: I265e0267afb22e3d3f80801191f1a810cd2be312
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/controls/material/ComboBox.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/material/MenuItem.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/material/qquickmaterialtheme.cpp | 30 | ||||
-rw-r--r-- | src/imports/controls/material/qquickmaterialtheme_p.h | 5 |
4 files changed, 32 insertions, 7 deletions
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index b87034c5..5529c546 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -54,7 +54,7 @@ T.ComboBox { padding: 12 //! [delegate] - delegate: ItemDelegate { + delegate: MenuItem { width: control.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData highlighted: control.highlightedIndex === index diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index c09e9912..e2042894 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -146,7 +146,7 @@ T.MenuItem { background: Rectangle { implicitWidth: 200 visible: control.pressed || control.highlighted - color: control.pressed ? control.Material.flatButtonPressColor : control.Material.backgroundColor + color: control.pressed ? control.Material.flatButtonPressColor : control.Material.listHighlightColor } //! [background] } 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; } diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index e144233c..27ffdddc 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -65,7 +65,10 @@ public: private: QFont systemFont; - QFont tabButtonFont; + QFont buttonFont; + QFont toolButtonFont; + QFont itemViewFont; + QFont menuItemFont; }; QT_END_NAMESPACE |