diff options
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/material/TabButton.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 87ab1b2d..7376aecc 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -119,7 +119,7 @@ T.ComboBox { popup: T.Popup { width: control.width - implicitHeight: listview.contentHeight + implicitHeight: contentItem.implicitHeight transformOrigin: Item.Top topMargin: 12 bottomMargin: 12 @@ -141,10 +141,12 @@ T.ComboBox { } contentItem: ListView { - id: listview clip: true + implicitHeight: contentHeight model: control.popup.visible ? control.delegateModel : null currentIndex: control.highlightedIndex + highlightRangeMode: ListView.ApplyRange + highlightMoveDuration: 0 T.ScrollIndicator.vertical: ScrollIndicator { } } diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index cac0f19a..b2106626 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -43,9 +43,9 @@ T.TabButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem.contentWidth + leftPadding + rightPadding) + contentItem.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentItem.contentHeight + topPadding + bottomPadding) + contentItem.implicitHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 0e9f31df..3fb2a7f8 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -391,7 +391,7 @@ static bool globalBackgroundCustom = true; static const QRgb backgroundColorLight = 0xFFFAFAFA; static const QRgb backgroundColorDark = 0xFF303030; static const QRgb dialogColorLight = 0xFFFFFFFF; -static const QRgb dialogColorDark = 0xFF303030; +static const QRgb dialogColorDark = 0xFF424242; static const QRgb primaryTextColorLight = 0xDD000000; static const QRgb primaryTextColorDark = 0xFFFFFFFF; static const QRgb secondaryTextColorLight = 0x89000000; @@ -469,6 +469,8 @@ void QQuickMaterialStyle::setTheme(Theme theme) propagateTheme(); emit themeChanged(); emit paletteChanged(); + if (!m_customAccent) + emit accentChanged(); if (!m_hasBackground) emit backgroundChanged(); if (!m_hasForeground) @@ -484,6 +486,8 @@ void QQuickMaterialStyle::inheritTheme(Theme theme) propagateTheme(); emit themeChanged(); emit paletteChanged(); + if (!m_customAccent) + emit accentChanged(); if (!m_hasBackground) emit backgroundChanged(); if (!m_hasForeground) |