Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qml/windowed/AppList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ ColumnLayout {
loader.item.focus = true
}

function positionViewAtBeginning() {
loader.item.positionViewAtBeginning()
function resetViewState() {
loader.item.resetViewState()
}

function switchToFreeSort(freeSort) {
Expand Down
8 changes: 7 additions & 1 deletion qml/windowed/AppListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ FocusScope {

property Item keyTabTarget: listView
property alias model: listView.model
property var categoryMenu: null

function positionViewAtBeginning() {
function resetViewState() {
listView.positionViewAtBeginning()
if (!LauncherController.visible) {
alphabetCategoryPopup.close()
if (categoryMenu) categoryMenu.close()
}
}

function scrollToAlphabetCategory(character) {
Expand Down Expand Up @@ -133,6 +138,7 @@ FocusScope {
} else if (CategorizedSortProxyModel.categoryType === CategorizedSortProxyModel.DDECategory) {
ddeCategoryMenu.existingSections = CategorizedSortProxyModel.DDECategorySections()
listView.opacity = 0.1
root.categoryMenu = ddeCategoryMenu
ddeCategoryMenu.open()
}
}
Expand Down
4 changes: 2 additions & 2 deletions qml/windowed/WindowedFrame.qml
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ InputEventItem {
bottomBar.searchEdit.text = ""
// reset(remove) keyboard focus
baseLayer.focus = true
// reset scroll area position
appList.positionViewAtBeginning()
// reset scroll area position and state
appList.resetViewState()
folderGridViewPopup.close()
}
}
Expand Down