From 26e2342e248bc89eca2e721c28d069506c008966 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 24 Feb 2023 15:41:00 +0200 Subject: [PATCH] QmlDesigner: Don't change focus on expand when focus is in search box This is to avoid search box focus loss if search autoexpands sections. Fixes: QDS-9259 Change-Id: Ief99643d52413fe83d4b5ac5ea3438d6116d64c7 Reviewed-by: Mahmoud Badri --- .../materialBrowserQmlSource/MaterialBrowser.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml index 7e29bf1508e..a20e09e7043 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -644,7 +644,8 @@ Item { if (expanded) { if (root.visibleItemCount(materialBrowserModel) > 0) rootView.focusMaterialSection(true) - scrollView.forceActiveFocus() + if (!searchBox.activeFocus) + scrollView.forceActiveFocus() } else { root.startDelayedEnsureTimer(300) // wait for section collapse animation rootView.focusMaterialSection(false) @@ -738,7 +739,8 @@ Item { if (expanded) { if (root.visibleItemCount(materialBrowserTexturesModel) > 0) rootView.focusMaterialSection(false) - scrollView.forceActiveFocus() + if (!searchBox.activeFocus) + scrollView.forceActiveFocus() } else { root.startDelayedEnsureTimer(300) // wait for section collapse animation rootView.focusMaterialSection(true)