From 744d14b468eb4bdd4dabf72ef7acdca1bc07ea5d Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Fri, 12 Jan 2018 13:32:37 +0100
Subject: ComboBox: fix popup's deferred execution for the new styles

Same as 3ec6d04d in 5.9, but for the new styles in 5.10.

Task-number: QTBUG-50992
Change-Id: I211c0e6c0b290c1af310898f21850f9fad01b278
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/fusion/ComboBox.qml  | 5 ++---
 src/imports/controls/imagine/ComboBox.qml | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml
index 0f87240e..ade1566b 100644
--- a/src/imports/controls/fusion/ComboBox.qml
+++ b/src/imports/controls/fusion/ComboBox.qml
@@ -81,7 +81,7 @@ T.ComboBox {
 
         enabled: control.editable
         autoScroll: control.editable
-        readOnly: control.popup.visible
+        readOnly: control.down
         inputMethodHints: control.inputMethodHints
         validator: control.validator
 
@@ -140,7 +140,6 @@ T.ComboBox {
     }
 
     popup: T.Popup {
-        id: popup
         width: control.width
         height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin)
         topMargin: 6
@@ -151,7 +150,7 @@ T.ComboBox {
         contentItem: ListView {
             clip: true
             implicitHeight: contentHeight
-            model: control.popup.visible ? control.delegateModel : null
+            model: control.delegateModel
             currentIndex: control.highlightedIndex
             highlightRangeMode: ListView.ApplyRange
             highlightMoveDuration: 0
diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml
index ce23d1f8..6d9a1162 100644
--- a/src/imports/controls/imagine/ComboBox.qml
+++ b/src/imports/controls/imagine/ComboBox.qml
@@ -71,7 +71,7 @@ T.ComboBox {
                 {"disabled": !control.enabled},
                 {"pressed": control.pressed},
                 {"editable": control.editable},
-                {"open": control.popup.visible},
+                {"open": control.down},
                 {"focused": control.visualFocus},
                 {"mirrored": control.mirrored},
                 {"hovered": control.hovered},
@@ -90,7 +90,7 @@ T.ComboBox {
 
         enabled: control.editable
         autoScroll: control.editable
-        readOnly: control.popup.visible
+        readOnly: control.down
         inputMethodHints: control.inputMethodHints
         validator: control.validator
 
@@ -112,7 +112,7 @@ T.ComboBox {
                 {"disabled": !control.enabled},
                 {"pressed": control.pressed},
                 {"editable": control.editable},
-                {"open": control.popup.visible},
+                {"open": control.down},
                 {"focused": control.visualFocus || (control.editable && control.activeFocus)},
                 {"mirrored": control.mirrored},
                 {"hovered": control.hovered},
@@ -142,7 +142,7 @@ T.ComboBox {
         contentItem: ListView {
             clip: true
             implicitHeight: contentHeight
-            model: control.popup.visible ? control.delegateModel : null
+            model: control.delegateModel
             currentIndex: control.highlightedIndex
             highlightMoveDuration: 0
 
-- 
cgit v1.2.3