diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2019-11-18 14:33:06 +0100 |
|---|---|---|
| committer | Henning Gründl <henning.gruendl@qt.io> | 2019-11-25 09:38:22 +0000 |
| commit | f80b676e4aef3a8ae23281594615bbc26db6f367 (patch) | |
| tree | 126579666669d22435335fbffae8bdd24415be5b | |
| parent | 6ee83b4c19eceba502079ae20a906e9201a9b403 (diff) | |
| download | qt-creator-f80b676e4aef3a8ae23281594615bbc26db6f367.tar.gz | |
QmlDesigner: Fix sticky popups
Task-number: QTCREATORBUG-23102
Change-Id: I53a2abc67221b714e2b4ff7d09045f0b817b59d2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
3 files changed, 12 insertions, 6 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml index f8865e62cf..747a0d4510 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml @@ -185,7 +185,9 @@ T.ComboBox { StudioTheme.Values.maxComboBoxPopupHeight) padding: StudioTheme.Values.border margins: 0 // If not defined margin will be -1 - closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent + closePolicy: T.Popup.CloseOnPressOutside | T.Popup.CloseOnPressOutsideParent + | T.Popup.CloseOnEscape | T.Popup.CloseOnReleaseOutside + | T.Popup.CloseOnReleaseOutsideParent contentItem: ListView { clip: true diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Menu.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Menu.qml index 01a86847fc..773282958f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Menu.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Menu.qml @@ -1,3 +1,5 @@ + + /**************************************************************************** ** ** Copyright (C) 2019 The Qt Company Ltd. @@ -22,7 +24,6 @@ ** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ - import QtQuick 2.12 import QtQuick.Window 2.12 import QtQuick.Templates 2.12 as T @@ -43,10 +44,11 @@ T.Menu { overlap: 1 padding: 0 - closePolicy: T.Popup.CloseOnPressOutside | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnEscape + closePolicy: T.Popup.CloseOnPressOutside | T.Popup.CloseOnPressOutsideParent + | T.Popup.CloseOnEscape | T.Popup.CloseOnReleaseOutside + | T.Popup.CloseOnReleaseOutsideParent - delegate: MenuItem { - } + delegate: MenuItem {} contentItem: ListView { model: control.contentModel diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml index fe83e82ee6..dd6be8cbc1 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml @@ -33,7 +33,9 @@ T.Popup { property T.Control myControl dim: false - closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent + closePolicy: T.Popup.CloseOnPressOutside | T.Popup.CloseOnPressOutsideParent + | T.Popup.CloseOnEscape | T.Popup.CloseOnReleaseOutside + | T.Popup.CloseOnReleaseOutsideParent background: Rectangle { color: StudioTheme.Values.themeControlBackground |