feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix effect maker popup doesn't close on focus out on mac

Browse Source 
Fixes: QDS-10515
Change-Id: Icaef0532bd2427e9cac326f40143e158ca8c5e97
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2023-09-21 13:53:39 +03:00
parent 25b540d995
commit e4b8af404b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml
View File

@@ -47,7 +47,7 @@ StudioControls.ComboBox {
width: row.width + 2 // 2: scrollView left and right 1px margins 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 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: { onActiveFocusItemChanged: {
if (!window.activeFocusItem && !root.indicator.hover && root.popup.opened) if (!window.activeFocusItem && !root.indicator.hover && root.popup.opened)

2
share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml
View File

@@ -67,7 +67,7 @@ StudioControls.ComboBox {
width: col.width + 2 // 2: scrollView left and right 1px margins 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 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: { onActiveFocusItemChanged: {
if (!window.activeFocusItem && !root.indicator.hover && root.popup.opened) if (!window.activeFocusItem && !root.indicator.hover && root.popup.opened)