twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-07-25 17:21:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

screencopy: fix incorrect noscreenshare positions with monitor scaling (#10674)

Browse Source
This commit is contained in:
Kamikadze
2025-06-08 12:19:23 +05:00
committed by GitHub
parent 91967f8ec0
commit c6f713fefe
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/protocols/Screencopy.cpp
View File

@@ -216,15 +216,15 @@ void CScreencopyFrame::renderMon() {
const auto REALPOS = w->m_realPosition->value() + (w->m_pinned ? Vector2D{} : PWORKSPACE->m_renderOffset->value());
const auto noScreenShareBox = CBox{REALPOS.x, REALPOS.y, std::max(w->m_realSize->value().x, 5.0), std::max(w->m_realSize->value().y, 5.0)}
.translate(-m_monitor->m_position)
.scale(m_monitor->m_scale)
.translate({-m_monitor->m_position.x, -m_monitor->m_position.y})
.translate({-m_box.x, -m_box.y});
.translate(-m_box.pos());
const auto dontRound = w->isEffectiveInternalFSMode(FSMODE_FULLSCREEN) || w->m_windowData.noRounding.valueOrDefault();
const auto rounding = dontRound ? 0 : w->rounding() * m_monitor->m_scale;
const auto roundingPower = dontRound ? 2.0f : w->roundingPower();
g_pHyprOpenGL->renderRect(noScreenShareBox, {0, 0, 0, 255}, rounding, roundingPower);
g_pHyprOpenGL->renderRect(noScreenShareBox, Colors::BLACK, rounding, roundingPower);
if (w->m_isX11 || !w->m_popupHead)
continue;
@@ -241,13 +241,10 @@ void CScreencopyFrame::renderMon() {
popup->m_wlSurface->resource()->breadthfirst(
[&](SP<CWLSurfaceResource> surf, const Vector2D& localOff, void*) {
const auto size = surf->m_current.size;
const auto surfBox = CBox{popupBaseOffset.x + popRel.x + localOff.x, popupBaseOffset.y + popRel.y + localOff.y, size.x, size.y}
.scale(m_monitor->m_scale)
.translate({-m_monitor->m_position.x, -m_monitor->m_position.y})
.translate({-m_box.x, -m_box.y});
const auto surfBox = CBox{popupBaseOffset + popRel + localOff, size}.translate(-m_monitor->m_position).scale(m_monitor->m_scale).translate(-m_box.pos());
if LIKELY (surfBox.w > 0 && surfBox.h > 0)
g_pHyprOpenGL->renderRect(surfBox, {0, 0, 0, 255});
g_pHyprOpenGL->renderRect(surfBox, Colors::BLACK);
},
nullptr);
},