aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml
diff options
context:
space:
mode:
Diffstat (limited to 'share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml')
-rw-r--r--share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml6
1 files changed, 4 insertions, 2 deletions
diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml
index 7829c2aade..a2933cb145 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)