fix: Fix the focus issue on secondary pages in Quick Settings #1355
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix the focus issue on secondary pages in Quick Settings Log: Fix the focus issue on secondary pages in Quick Settings pms: BUG-341435
deepin pr auto review我来对这段代码变更进行审查：
function takeFocus() {
if (impl) {
impl.takeFocus()
}
}改进建议：
总体来说，这是一个合理的代码变更，实现了焦点管理的功能，但可以通过添加错误处理和注释来提高代码质量。 |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideThis PR fixes a focus handling bug on secondary Quick Settings pages by adding explicit focus delegation functions and invoking them when pages become active in the StackView. Sequence diagram for focus delegation on Quick Settings secondary pagessequenceDiagram
actor User
participant QuickPanelPage
participant StackView
participant SubPluginPage
participant ShellSurfaceItemProxy as SurfaceLayer
participant ShellSurfaceItemImpl as ShellSurfaceItem
User->>QuickPanelPage: select_secondary_quick_setting()
QuickPanelPage->>StackView: push(SubPluginPage)
StackView->>SubPluginPage: activate()
note over StackView,SubPluginPage: StackView.onActivated triggers
StackView->>SubPluginPage: takeFocus()
SubPluginPage->>SurfaceLayer: takeFocus()
SurfaceLayer->>ShellSurfaceItem: takeFocus()
ShellSurfaceItem-->>SurfaceLayer: focus_set()
SurfaceLayer-->>SubPluginPage: focus_confirmed()
SubPluginPage-->>User: secondary_page_is_focused()
Updated class diagram for Quick Settings focus handling componentsclassDiagram
class ShellSurfaceItemProxy {
+int implicitWidth
+int implicitHeight
+ShellSurfaceItem impl
+takeFocus()
}
class ShellSurfaceItem {
+int width
+int height
+takeFocus()
}
ShellSurfaceItemProxy *-- ShellSurfaceItem : contains_impl
class SubPluginPage {
+int subPluginMinHeight
+int headerMargin
+Item surfaceLayer
+takeFocus()
}
SubPluginPage *-- ShellSurfaceItemProxy : uses_as_surfaceLayer
class QuickPanelPage {
+int contentHeight
+Item panelView
+StackView stackView
}
class StackView {
+onActivating()
+onActivated()
+push(page)
}
QuickPanelPage *-- StackView : contains
StackView --> SubPluginPage : manages_pages
class FocusFlow {
+takeFocus()
}
FocusFlow <|.. ShellSurfaceItemProxy : focus_delegate
FocusFlow <|.. SubPluginPage : focus_delegate
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes and found some issues that need to be addressed.
- In QuickPanelPage.qml,
StackView.onActivatedblindly callstakeFocus(), which will throw if a given page/delegate does not implement that function; consider checking for its existence (e.g.,if (typeof takeFocus === 'function') takeFocus();) or using a more generic focus API. - In SubPluginPage.qml and ShellSurfaceItemProxy.qml, the new
takeFocus()helpers assumesurfaceLayer/implalways exist and exposetakeFocus; adding null/feature checks would make this safer against future layout or component changes.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In QuickPanelPage.qml, `StackView.onActivated` blindly calls `takeFocus()`, which will throw if a given page/delegate does not implement that function; consider checking for its existence (e.g., `if (typeof takeFocus === 'function') takeFocus();`) or using a more generic focus API.
- In SubPluginPage.qml and ShellSurfaceItemProxy.qml, the new `takeFocus()` helpers assume `surfaceLayer`/`impl` always exist and expose `takeFocus`; adding null/feature checks would make this safer against future layout or component changes.
## Individual Comments
### Comment 1
<location> `panels/dock/tray/quickpanel/QuickPanelPage.qml:67-68` </location>
<code_context>
StackView.onActivating: function () {
panelView.contentHeight = Qt.binding(function() { return contentHeight})
}
+ StackView.onActivated: function () {
+ takeFocus()
+ }
}
</code_context>
<issue_to_address>
**issue (bug_risk):** Unqualified `takeFocus()` here is likely calling the wrong (or a non-existent) function.
Within this `StackView.onActivated` handler, `takeFocus()` will be resolved through the JS scope chain rather than on the activated item. If the goal is to focus the newly activated page, call it explicitly on that item (for example, `currentItem && currentItem.takeFocus()`) or another clearly scoped reference. As written, it may either invoke an unintended function or fail at runtime if `takeFocus` is not defined in the current scope.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
caixr23
approved these changes
Nov 26, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: caixr23, pengfeixx The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/forcemerge |
|
This pr force merged! (status: blocked) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the focus issue on secondary pages in Quick Settings
Log: Fix the focus issue on secondary pages in Quick Settings
pms: BUG-341435
Summary by Sourcery
Fix focus handling in Quick Settings pages to ensure the active view correctly receives focus when navigated to.
Bug Fixes: