Skip to content

Commit fea4494

Browse files
wjyrichBLumia
authored andcommitted
fix: The alphabet also closes when the launchpad is shut down
as title. PMS-BUG-289179
1 parent fbb5af8 commit fea4494

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

qml/windowed/AppList.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ColumnLayout {
2525
loader.item.focus = true
2626
}
2727

28-
function positionViewAtBeginning() {
29-
loader.item.positionViewAtBeginning()
28+
function resetViewState() {
29+
loader.item.resetViewState()
3030
}
3131

3232
function switchToFreeSort(freeSort) {

qml/windowed/AppListView.qml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@ FocusScope {
1717

1818
property Item keyTabTarget: listView
1919
property alias model: listView.model
20+
property var categoryMenu: null
2021

21-
function positionViewAtBeginning() {
22+
function resetViewState() {
2223
listView.positionViewAtBeginning()
24+
if (!LauncherController.visible) {
25+
alphabetCategoryPopup.close()
26+
if (categoryMenu) categoryMenu.close()
27+
}
2328
}
2429

2530
function scrollToAlphabetCategory(character) {
@@ -133,6 +138,7 @@ FocusScope {
133138
} else if (CategorizedSortProxyModel.categoryType === CategorizedSortProxyModel.DDECategory) {
134139
ddeCategoryMenu.existingSections = CategorizedSortProxyModel.DDECategorySections()
135140
listView.opacity = 0.1
141+
root.categoryMenu = ddeCategoryMenu
136142
ddeCategoryMenu.open()
137143
}
138144
}

qml/windowed/WindowedFrame.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ InputEventItem {
286286
bottomBar.searchEdit.text = ""
287287
// reset(remove) keyboard focus
288288
baseLayer.focus = true
289-
// reset scroll area position
290-
appList.positionViewAtBeginning()
289+
// reset scroll area position and state
290+
appList.resetViewState()
291291
folderGridViewPopup.close()
292292
}
293293
}

0 commit comments

Comments
 (0)