Skip to content

Revert "fix(a11y): fix Accessible.id crash and compile warning" - #1787

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
MyLeeJiEun:fix/revert-accessible-id-workaround
Nov 9, 2026
Merged

deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
MyLeeJiEun:fix/revert-accessible-id-workaround

Conversation

@MyLeeJiEun

@MyLeeJiEun MyLeeJiEun commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

This reverts commit 72b624a, except for the m_ActiveId int -> uint change, which is kept to avoid the sign-compare error under -Werror.

The Accessible.id workaround is no longer needed: the Qt fix removing REVISION(6, 8) from Accessible.id has already landed in the integration environment, so the static Accessible.id bindings work again. https://github.com/deepin-community/qt6-declarative/pull/37/changes#diff-93467241211d3f9d253fb8ad341738fbda5e5d3ade4721326f2bba82525fbaee

Summary by Sourcery

Restore direct accessibility ID declarations while preserving the compiler-warning fix for the active accessibility ID.

Bug Fixes:

  • Restore declarative Accessible.id bindings across dock and notification QML components now that the underlying Qt issue is fixed.

Enhancements:

  • Retain the unsigned active-ID type change to avoid sign-comparison build warnings while reverting the workaround implementation.

Chores:

  • Revert the Accessible.id initialization workaround and remove the associated obsolete copyright-year change.

@MyLeeJiEun
MyLeeJiEun requested a review from mhduiy October 28, 2026 10:43
@sourcery-ai

sourcery-ai Bot commented Oct 28, 2026 •

Copy link
Copy Markdown

Reviewer's Guide

Implementation

Update the affected header’s copyright year while retaining the active-ID type fix described by the revert.

  • panels/dock/appruntimeitem/windowmanager.h L1

UI

Restore declarative accessibility ID bindings across dock components now that the Qt fix allows static bindings to work.

  • panels/dock/OverflowContainer.qml L23
  • panels/dock/appruntimeitem/package/appruntimeitem.qml L24, L32
  • panels/dock/multitaskview/package/multitaskview.qml L21
  • panels/dock/package/main.qml L638, L688, L718
  • panels/dock/showdesktop/package/showdesktop.qml L25
  • panels/dock/taskmanager/package/AppItem.qml L84-645 (6 small edits)
  • panels/dock/taskmanager/package/TaskManager.qml L122, L232, L256 (removed lines)
  • panels/dock/tray/SurfacePopup.qml L22-88 (5 small edits)
  • panels/dock/tray/SurfaceSubPopup.qml L51, L60
  • panels/dock/tray/TrayItemSurfacePopup.qml L31-137 (7 small edits)
  • panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml L19, L89
  • panels/dock/tray/package/ActionShowStashDelegate.qml L119
  • panels/dock/tray/package/ActionToggleCollapseDelegate.qml L57
  • panels/dock/tray/package/DummyDelegate.qml L11
  • panels/dock/tray/package/StashContainer.qml L75
  • panels/dock/tray/package/StashedItemDelegateChooser.qml L28-31, L39-43, L117-120 (+1 small edits)
  • panels/dock/tray/package/TrayItemDelegateChooser.qml L26-30, L71-74, L95-99 (+4 small edits)
  • panels/dock/tray/package/tray.qml L41-147 (5 small edits)
  • panels/dock/tray/quickpanel/DragItem.qml L126
  • panels/dock/tray/quickpanel/PanelPluginPage.qml L79
  • panels/dock/tray/quickpanel/PanelTrayItem.qml L36, L98
  • panels/dock/tray/quickpanel/PluginItem.qml L31, L56
  • panels/dock/tray/quickpanel/QuickPanel.qml L63-113 (5 small edits)
  • panels/dock/tray/quickpanel/QuickPanelPage.qml L43, L59
  • panels/dock/tray/quickpanel/SubPluginPage.qml L93

Restore declarative accessibility ID bindings across notification components, including list delegates and controls.

  • panels/notification/bubble/package/Bubble.qml L14
  • panels/notification/bubble/package/main.qml L94, L187
  • panels/notification/center/GroupNotify.qml L14-122 (5 small edits)
  • panels/notification/center/NormalNotify.qml L14, L58
  • panels/notification/center/NotifyCenter.qml L50, L78, L103
  • panels/notification/center/NotifyHeader.qml L76-153 (5 small edits)
  • panels/notification/center/NotifyHeaderTitleText.qml L13
  • panels/notification/center/NotifySetting.qml L18, L27
  • panels/notification/center/NotifyStaging.qml L83, L94
  • panels/notification/center/NotifyView.qml L70, L255
  • panels/notification/center/NotifyViewDelegate.qml L60-194 (4 small edits)
  • panels/notification/center/OverlapNotify.qml L14, L106, L151
  • panels/notification/center/package/main.qml L218, L246
  • panels/notification/osd/displaymode/package/main.qml L44, L57
  • panels/notification/osd/kblayout/package/main.qml L36, L58, L150 (removed lines)
  • panels/notification/osd/windoweffect/package/main.qml L75, L87
  • panels/notification/plugin/NotifyAction.qml L183
  • panels/notification/plugin/NotifyItemContent.qml L14, L121, L341

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨

This reverts commit 72b624a, except for
the m_ActiveId int -> uint change, which is kept to avoid the sign-compare
error under -Werror.

The Accessible.id workaround is no longer needed: the Qt fix removing
REVISION(6, 8) from Accessible.id has already landed in the integration
environment, so the static Accessible.id bindings work again.
https://github.com/deepin-community/qt6-declarative/pull/37/changes#diff-93467241211d3f9d253fb8ad341738fbda5e5d3ade4721326f2bba82525fbaee
@MyLeeJiEun
MyLeeJiEun force-pushed the fix/revert-accessible-id-workaround branch from 9ddfe59 to a38e16a Compare November 9, 2026 08:31
@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

🤖 AI 代码审查报告

总体评分: 100 分 (通过阈值: 70分)

Pass


📊 总体评价

项目 结果
审查结论 代码审查通过
评分详情 本次提交是对 Accessible.id 无障碍属性设置方式的回退,将命令式 Component.onCompleted 赋值改回声明式属性绑定,涉及30个QML文件,变更一致且无安全风险。四维度均通过,无安全漏洞。

🔍 详细分析

1. 语法逻辑 ✅

评价: 语法正确,逻辑清晰 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: []


2. 代码质量 ✅

评价: 代码结构清晰,注释完整 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: ['建议后续修复 tray.qml 中 TrayContainter 的拼写错误(应为 TrayContainer),此为历史遗留问题。']


3. 代码性能 ✅

评价: 性能良好,资源使用合理 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: []


4. 代码安全 🔒

评价: 存在0个安全漏洞 ✅ 通过

🔐 发现 0 个安全漏洞

安全漏洞详情:
✅ 未发现安全漏洞

建议: []


💡 改进建议代码示例


本报告由 AI 代码审查工具自动生成

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mhduiy, MyLeeJiEun

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mhduiy

mhduiy commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

revert 提交 忽略 CI

@MyLeeJiEun

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Nov 9, 2026

Copy link
Copy Markdown

This pr force merged! (status: blocked)

@deepin-bot
deepin-bot Bot merged commit 5709492 into linuxdeepin:master Nov 9, 2026
4 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants