From 86f6cee2ad4139015ff0bdccea2e8db629111701 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 12 Oct 2016 20:08:33 +1300 Subject: [PATCH] Fix Asset Browser add-to-world drop-down --- interface/resources/qml/controls-uit/ComboBox.qml | 3 +++ interface/resources/qml/dialogs/CustomQueryDialog.qml | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml index fa100a965f..573fed4ef9 100644 --- a/interface/resources/qml/controls-uit/ComboBox.qml +++ b/interface/resources/qml/controls-uit/ComboBox.qml @@ -32,6 +32,8 @@ FocusScope { readonly property ComboBox control: comboBox + signal accepted(); + implicitHeight: comboBox.height; focus: true @@ -134,6 +136,7 @@ FocusScope { function hideList() { popup.visible = false; scrollView.hoverEnabled = false; + root.accepted(); } FocusScope { diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml index 563dfc3099..96acc33069 100644 --- a/interface/resources/qml/dialogs/CustomQueryDialog.qml +++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml @@ -224,7 +224,10 @@ ModalWindow { bottom: parent.bottom; } model: root.comboBox ? root.comboBox.items : []; - onCurrentTextChanged: updateCheckbox(); + onAccepted: { + updateCheckbox(); + focus = true; + } } }