From e4b8af404be0a5c1ac92709435c6ce2ed0e134e9 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Thu, 21 Sep 2023 13:53:39 +0300 Subject: [PATCH] QmlDesigner: Fix effect maker popup doesn't close on focus out on mac Fixes: QDS-10515 Change-Id: Icaef0532bd2427e9cac326f40143e158ca8c5e97 Reviewed-by: Miikka Heikkinen --- .../qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml | 2 +- .../qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml index 6d1b1cec960..b076e152cc0 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml @@ -47,7 +47,7 @@ StudioControls.ComboBox { width: row.width + 2 // 2: scrollView left and right 1px margins height: Math.min(800, Math.min(row.height + 2, Screen.height - y - 40)) // 40: some bottom margin to cover OS bottom toolbar - flags: Qt.Popup | Qt.FramelessWindowHint + flags: Qt.Dialog | Qt.FramelessWindowHint onActiveFocusItemChanged: { if (!window.activeFocusItem && !root.indicator.hover && root.popup.opened) diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml index 445935b532e..a53a923ca6b 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml @@ -67,7 +67,7 @@ StudioControls.ComboBox { width: col.width + 2 // 2: scrollView left and right 1px margins height: Math.min(800, Math.min(col.height + 2, Screen.height - y - 40)) // 40: some bottom margin to cover OS bottom toolbar - flags: Qt.Popup | Qt.FramelessWindowHint + flags: Qt.Dialog | Qt.FramelessWindowHint onActiveFocusItemChanged: { if (!window.activeFocusItem && !root.indicator.hover && root.popup.opened)