Skip to content

fix: fix display scaling menu visibility logic#670

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
robertkill:master
Nov 26, 2025
Merged

fix: fix display scaling menu visibility logic#670
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
robertkill:master

Conversation

@robertkill

@robertkill robertkill commented Nov 26, 2025

Copy link
Copy Markdown
Contributor

Fixed display scaling menu enabled state to properly check visibility before checking desktopId condition. Previously the menu item could be enabled even when not visible due to the visibility check being separate from the enabled condition. Now the enabled state correctly depends on both the visibility condition and the desktopId check.

修复显示缩放菜单可见性逻辑

修复了显示缩放菜单启用状态的逻辑,现在在检查 desktopId 条件之前会正确检
查可见性。之前由于可见性检查与启用条件分离,即使菜单项不可见也可能被启
用。现在启用状态正确地同时依赖于可见性条件和 desktopId 检查。

PMS: BUG-341119

Summary by Sourcery

Bug Fixes:

  • Fix display scaling menu item being enabled even when the menu is not visible.

Fixed display scaling menu enabled state to properly check visibility
before checking desktopId condition. Previously the menu item could be
enabled even when not visible due to the visibility check being separate
from the enabled condition. Now the enabled state correctly depends on
both the visibility condition and the desktopId check.

修复显示缩放菜单可见性逻辑

修复了显示缩放菜单启用状态的逻辑,现在在检查 desktopId 条件之前会正确检
查可见性。之前由于可见性检查与启用条件分离,即使菜单项不可见也可能被启
用。现在启用状态正确地同时依赖于可见性条件和 desktopId 检查。

PMS: BUG-341119
@sourcery-ai

sourcery-ai Bot commented Nov 26, 2025

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adjusts the display scaling menu item’s enabled-state logic so it is only enabled when both the menu is visible and the desktopId does not start with the internal folders prefix.

Flow diagram for display scaling menu enabled condition

flowchart TD
  A[Start evaluating display scaling MenuItem state] --> B[Evaluate visible
  visible = not hideDisplayScalingMenu]
  B --> C{visible == true?}
  C -- No --> D[MenuItem height = 0
  MenuItem enabled = false]
  C -- Yes --> E{root.desktopId startsWith internal/folders/?}
  E -- Yes --> F[MenuItem enabled = false
  MenuItem height = implicitHeight]
  E -- No --> G[MenuItem enabled = true
  MenuItem height = implicitHeight]
  D --> H[End]
  F --> H
  G --> H
Loading

File-Level Changes

Change Details Files
Tie the display scaling menu item enabled state to its visibility as well as the desktopId check.
  • Use the MenuItem.visible property directly in the enabled expression instead of only checking desktopId
  • Prevent the menu item from being enabled when it is hidden, avoiding inconsistent UI states
qml/AppItemMenu.qml

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 there - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: BLumia, robertkill

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

@robertkill

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Nov 26, 2025

Copy link
Copy Markdown

This pr force merged! (status: blocked)

@deepin-bot deepin-bot Bot merged commit 57f90b3 into linuxdeepin:master Nov 26, 2025
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