From 878a5db73e2c83e7855fc6515e91cd5ee0aad319 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 (cherry picked from commit 26e2342e248bc89eca2e721c28d069506c008966) Reviewed-by: Tim Jenssen --- .../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 7829c2aade1..a2933cb1453 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -639,7 +639,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) @@ -728,7 +729,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)