Skip to content

[pull] master from flameshot-org:master#157

Merged
pull[bot] merged 2 commits intoUncodedtech:masterfrom
flameshot-org:master
Aug 12, 2025
Merged

[pull] master from flameshot-org:master#157
pull[bot] merged 2 commits intoUncodedtech:masterfrom
flameshot-org:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Aug 12, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.3)

Can you help keep this open source service alive? 💖 Please sponsor : )

ElTh0r0 and others added 2 commits August 11, 2025 15:36
* Fix dual monitor offset bug in Qt6 multi-monitor setups

The issue was caused by using QApplication::primaryScreen() to capture
the entire desktop, but in Qt6 the primary screen is not necessarily
the leftmost screen. This caused coordinate system misalignment in
multi-monitor setups where the primary screen is positioned to the right.

Additionally, the previous approach failed in edge cases where screens
have different heights and the desktop bounding box includes virtual
space that doesn't correspond to any physical screen.

Changes:
- Replace single-screen desktop capture with composite approach
- Capture each screen individually and composite them together
- Position capture widget to cover entire desktop geometry
- Remove devicePixelRatio division that caused coordinate issues
- Handle virtual desktop space by filling with black background

This solution works with any multi-monitor configuration including:
- Primary screen not being leftmost
- Screens with different resolutions and alignments
- Bottom-aligned or top-aligned screen arrangements
- Complex layouts with virtual coordinate space

Fixes #4111

* Fix clang-format issue

---------

Co-authored-by: ionsquare <ionsquare@users.noreply.github.com>
@pull pull Bot locked and limited conversation to collaborators Aug 12, 2025
@pull pull Bot added the ⤵️ pull label Aug 12, 2025
@pull pull Bot merged commit 8d8a4c9 into Uncodedtech:master Aug 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants