Skip to content

Commit

Permalink
fix: searchEdit focus not changed after menu popup
Browse files Browse the repository at this point in the history
focus to baseLayer after menu popup

Issue: linuxdeepin/developer-center#7629
  • Loading branch information
kegechen committed May 28, 2024
1 parent 6c7f0ce commit 38c8a6e
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions qml/FolderGridViewPopup.qml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ Popup {
}
onMenuTriggered: {
showContextMenu(this, model)
baseLayer.focus = true
}
}
}
Expand Down
1 change: 1 addition & 0 deletions qml/FullscreenFrame.qml
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ Control {
onMenuTriggered: {
if (folderIcons) return;
showContextMenu(this, model)
baseLayer.focus = true
}
}
}
Expand Down
1 change: 1 addition & 0 deletions qml/windowed/AppListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ FocusScope {
acceptedButtons: Qt.RightButton
onTapped: {
showContextMenu(itemDelegate, model)
baseLayer.focus = true
}
}

Expand Down
2 changes: 2 additions & 0 deletions qml/windowed/FreeSortListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ Item {
// not folder
if (iconName)
showContextMenu(itemDelegate, model)

baseLayer.focus = true
} else {
if (itemType === ItemArrangementProxyModel.FolderItemType) {
console.log("freesort view folder clicked:", desktopId);
Expand Down
1 change: 1 addition & 0 deletions qml/windowed/FrequentlyUsedView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Control {
}
onMenuTriggered: {
showContextMenu(this, model)
baseLayer.focus = true
}
}

Expand Down
1 change: 1 addition & 0 deletions qml/windowed/RecentlyInstalledView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Control {
}
onMenuTriggered: {
showContextMenu(this, model)
baseLayer.focus = true
}
}
activeFocusOnTab: visible && gridViewFocus
Expand Down
1 change: 1 addition & 0 deletions qml/windowed/SearchResultView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Control {
}
onMenuTriggered: {
showContextMenu(this, model)
baseLayer.focus = true
}
}
}
Expand Down

0 comments on commit 38c8a6e

Please sign in to comment.