diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-04 12:54:38 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-09 11:43:49 +0000 |
| commit | 372c5b44e5bc2730c3557cf56bffc5496ab020f3 (patch) | |
| tree | 02ff1d36bdbd9bb6544fa5f21728dcfa5f9b404e /src/imports/controls/universal | |
| parent | befe5e0dca3b5af7ffa48b0f66794b083d43656f (diff) | |
Add QQuickComboBox::down
This allows us to replace all "control.pressed || popup.visible"
expressions with "control.down", and takes us one step closer to
deferred popop execution as mentioned in the previous commit. In
order to be able to defer the popup execution, we must get rid of
such explicit references to the popup.
Change-Id: Ifa7ecf8201912d3ec1bca232e2cf600e3886715e
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 536782c7..62aee832 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -37,7 +37,7 @@ import QtQuick 2.8 import QtQuick.Window 2.2 import QtQuick.Controls 2.1 -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.2 as T import QtQuick.Controls.Universal 2.1 T.ComboBox { @@ -90,10 +90,10 @@ T.ComboBox { border.width: control.flat ? 0 : 2 // ComboBoxBorderThemeThickness border.color: !control.enabled ? control.Universal.baseLowColor : - control.pressed || popup.visible ? control.Universal.baseMediumLowColor : + control.down ? control.Universal.baseMediumLowColor : control.hovered ? control.Universal.baseMediumColor : control.Universal.baseMediumLowColor color: !control.enabled ? control.Universal.baseLowColor : - control.pressed || popup.visible ? control.Universal.listMediumColor : + control.down ? control.Universal.listMediumColor : control.flat && control.hovered ? control.Universal.listLowColor : control.Universal.altMediumLowColor visible: !control.flat || control.pressed || control.hovered || control.visualFocus |