cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renderer: fix inconsistent border thickness for roundingPower < 2 (#11752)

Browse source
This commit is contained in:
REVO9 2025-09-19 00:34:54 +02:00 • committed by GitHub
parent 4fc95d646d
commit afd1e71761
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/render/decorations/CHyprBorderDecoration.cpp
View file

@ -70,14 +70,18 @@ void CHyprBorderDecoration::draw(PHLMONITOR pMonitor, float const& a) {
m_window->m_realBorderColorPrevious.m_angle = grad.m_angle; m_window->m_realBorderColorPrevious.m_angle = grad.m_angle;
} }
int borderSize = m_window->getRealBorderSize(); int borderSize = m_window->getRealBorderSize();
const auto ROUNDING = m_window->rounding() * pMonitor->m_scale; const auto ROUNDINGBASE = m_window->rounding();
const auto ROUNDINGPOWER = m_window->roundingPower(); const auto ROUNDING = ROUNDINGBASE * pMonitor->m_scale;
const auto ROUNDINGPOWER = m_window->roundingPower();
const auto CORRECTIONOFFSET = (borderSize * (M_SQRT2 - 1) * std::max(2.0 - ROUNDINGPOWER, 0.0));
const auto OUTERROUND = ((ROUNDINGBASE + borderSize) - CORRECTIONOFFSET) * pMonitor->m_scale;
CBorderPassElement::SBorderData data; CBorderPassElement::SBorderData data;
data.box = windowBox; data.box = windowBox;
data.grad1 = grad; data.grad1 = grad;
data.round = ROUNDING; data.round = ROUNDING;
data.outerRound = OUTERROUND;
data.roundingPower = ROUNDINGPOWER; data.roundingPower = ROUNDINGPOWER;
data.a = a; data.a = a;
data.borderSize = borderSize; data.borderSize = borderSize;

12
src/render/decorations/CHyprDropShadowDecoration.cpp
View file

@ -117,11 +117,13 @@ void CHyprDropShadowDecoration::render(PHLMONITOR pMonitor, float const& a) {
if (*PSHADOWS != 1) if (*PSHADOWS != 1)
return; // disabled return; // disabled
const auto ROUNDINGBASE = PWINDOW->rounding(); const auto BORDERSIZE = PWINDOW->getRealBorderSize();
const auto ROUNDINGPOWER = PWINDOW->roundingPower(); const auto ROUNDINGBASE = PWINDOW->rounding();
const auto ROUNDING = ROUNDINGBASE > 0 ? ROUNDINGBASE + PWINDOW->getRealBorderSize() : 0; const auto ROUNDINGPOWER = PWINDOW->roundingPower();
const auto PWORKSPACE = PWINDOW->m_workspace; const auto CORRECTIONOFFSET = (BORDERSIZE * (M_SQRT2 - 1) * std::max(2.0 - ROUNDINGPOWER, 0.0));
const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_pinned ? PWORKSPACE->m_renderOffset->value() : Vector2D(); const auto ROUNDING = ROUNDINGBASE > 0 ? (ROUNDINGBASE + BORDERSIZE) - CORRECTIONOFFSET : 0;
const auto PWORKSPACE = PWINDOW->m_workspace;
const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_pinned ? PWORKSPACE->m_renderOffset->value() : Vector2D();
// draw the shadow // draw the shadow
CBox fullBox = m_lastWindowBoxWithDecos; CBox fullBox = m_lastWindowBoxWithDecos;