Skip to content

fix: 将鼠标操作进行页面切换时，重新处理焦点给到第一个应用 #700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wjyrich merged 1 commit into from
Feb 2, 2026
Merged

fix: 将鼠标操作进行页面切换时，重新处理焦点给到第一个应用 #700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions qml/FullscreenFrame.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,14 @@ InputEventItem {
if (!searchEdit.focus) { // reset keyboard focus when using mouse to flip page, but keep searchEdit focus
baseLayer.focus = true
}
listviewPage.scrolledByWheel = true
listviewPage.changedByNonKeyboard = true
decrementPageIndex(listviewPage)
} else if (toPage > 0) {
flipPageDelay.start()
if (!searchEdit.focus) { // reset keyboard focus when using mouse to flip page, but keep searchEdit focus
baseLayer.focus = true
}
listviewPage.scrolledByWheel = true
listviewPage.changedByNonKeyboard = true
incrementPageIndex(listviewPage)
}
}
Expand Down Expand Up @@ -323,6 +323,11 @@ InputEventItem {
color: Qt.rgba(0, 0, 0, 0.1)
}
}
onCurrentIndexChanged: {
if (listviewPage.currentIndex !== currentIndex) {
listviewPage.changedByNonKeyboard = true
}
}
}
}
}
Expand Down Expand Up @@ -377,7 +382,7 @@ InputEventItem {
}

property int previousIndex: -1
property bool scrolledByWheel: false
property bool changedByNonKeyboard: false
model: itemPageModel

delegate: FocusScope {
Expand Down Expand Up @@ -434,10 +439,10 @@ InputEventItem {
listviewPage.previousIndex = listviewPage.currentIndex
return
}
// 如果是通过滚轮翻页，始终将焦点设置到第一个应用
if (listviewPage.scrolledByWheel) {
// 如果是通过非键盘方式(滚轮/indicator)翻页，始终将焦点设置到第一个应用
if (listviewPage.changedByNonKeyboard) {
gridViewContainer.setPreviousPageSwitch(false)
listviewPage.scrolledByWheel = false
listviewPage.changedByNonKeyboard = false
} else if (listviewPage.currentIndex + 1 === listviewPage.previousIndex || (listviewPage.previousIndex === 0 && listviewPage.currentIndex === listviewPage.count - 1)) {
gridViewContainer.setPreviousPageSwitch(true)
} else {
Expand Down