Skip to content

fix: need update exclusion zone when screen was added or removed #1093

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.

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
merged 1 commit into from
Apr 15, 2025

Conversation

yixinshark
Copy link
Contributor

@yixinshark yixinshark commented Apr 11, 2025

as title

Log: as title
Pms: BUG-306339

Summary by Sourcery

Update exclusion zone handling to trigger recalculation when screens are added or removed

Bug Fixes:

  • Ensure exclusion zone is updated correctly when screen configuration changes, including screen addition and removal

Enhancements:

  • Improve screen change event handling by starting exclusion zone timer for screen addition, removal, and screen changes

Copy link

sourcery-ai bot commented Apr 11, 2025

Reviewer's Guide by Sourcery

This pull request fixes an issue where the exclusion zone was not being updated when a screen was added or removed. It also corrects the calculation of the bottom strut partial. The changes involve connecting the screenRemoved signal to the exclusion zone update timer and adjusting the formula for calculating the bottom strut partial.

Sequence diagram for screen added event

sequenceDiagram
  participant QGuiApplication
  participant LayerShellEmulation
  participant QTimer

  QGuiApplication->>LayerShellEmulation: screenAdded(newScreen)
  activate LayerShellEmulation
  LayerShellEmulation->>newScreen: connect(geometryChanged, onPositionChanged)
  LayerShellEmulation->>newScreen: connect(geometryChanged, QTimer::start)
  LayerShellEmulation->>QTimer: start()
  deactivate LayerShellEmulation
Loading

Sequence diagram for screen removed event

sequenceDiagram
  participant QGuiApplication
  participant LayerShellEmulation
  participant QTimer

  QGuiApplication->>LayerShellEmulation: screenRemoved()
  activate LayerShellEmulation
  LayerShellEmulation->>QTimer: start()
  deactivate LayerShellEmulation
Loading

File-Level Changes

Change Details Files
Triggered an update to the exclusion zone when a screen is added or removed.
  • Connected the screenRemoved signal of the QGuiApplication to the m_exclusionZoneChangedTimer to start the timer when a screen is removed.
  • Started the m_exclusionZoneChangedTimer when a new screen is added.
frame/layershell/x11dlayershellemulation.cpp
Corrected the calculation of the bottom strut partial.
  • Removed an unnecessary addition in the calculation of strut_partial.bottom.
frame/layershell/x11dlayershellemulation.cpp

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!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @yixinshark - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider extracting the lambda connected to screenAdded into a named method for better readability.
  • It looks like m_exclusionZoneChangedTimer.start() is called twice when a screen is added, which is probably not what you want.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

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.

@yixinshark yixinshark requested a review from 18202781743 April 11, 2025 10:04
});
connect(qApp, &QGuiApplication::primaryScreenChanged, &m_exclusionZoneChangedTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_window, &QWindow::screenChanged, this, [this](QScreen *nowScreen){
onPositionChanged();
m_exclusionZoneChangedTimer.start();
});

connect(qApp, &QGuiApplication::screenRemoved, &m_exclusionZoneChangedTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
Copy link
Contributor

@18202781743 18202781743 Apr 15, 2025

Choose a reason for hiding this comment

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

这种插拔多次, 会重复连接吧,
是不是应该加上Qt::UniqueConnection,

@deepin-ci-robot
Copy link

deepin pr auto review

关键摘要:

  • 在新增的screenRemoved连接中,m_exclusionZoneChangedTimer.start();应该被移动到connect函数的lambda表达式中,以确保在屏幕移除时定时器能够正确启动。

是否建议立即修改:

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 18202781743, yixinshark

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

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

@yixinshark
Copy link
Contributor Author

/forcemerge

@deepin-bot
Copy link

deepin-bot bot commented Apr 15, 2025

This pr force merged! (status: blocked)

@deepin-bot deepin-bot bot merged commit 2d6b0db into linuxdeepin:master Apr 15, 2025
7 of 10 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