Skip to content

fix: Fix the focus issue on secondary pages in Quick Settings #1355

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
deepin-bot merged 1 commit into from
Nov 26, 2025
Merged

fix: Fix the focus issue on secondary pages in Quick Settings #1355

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions panels/dock/tray/ShellSurfaceItemProxy.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ Item {
implicitWidth: shellSurface ? shellSurface.width : 10
implicitHeight: shellSurface ? shellSurface.height : 10

function takeFocus() {
impl.takeFocus()
}

ShellSurfaceItem {
id: impl
width: parent.width
Expand Down
3 changes: 3 additions & 0 deletions panels/dock/tray/quickpanel/QuickPanelPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ Item {
StackView.onActivating: function () {
panelView.contentHeight = Qt.binding(function() { return contentHeight})
}
StackView.onActivated: function () {
takeFocus()
}
}
}
}
4 changes: 4 additions & 0 deletions panels/dock/tray/quickpanel/SubPluginPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ Item {
property int subPluginMinHeight
property int headerMargin: 10

function takeFocus() {
surfaceLayer.takeFocus()
}

Component.onCompleted: {
var surfaceMinHeight = subPluginMinHeight - titleLayer.height - headerMargin
shellSurface.setEmbedPanelMinHeight(surfaceMinHeight)
Expand Down