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

groupbar: fix rounding logic for edge cases (#12366)

Browse source
This commit is contained in:
Jochim 2025-11-17 13:13:29 +01:00 • committed by GitHub
parent 2b14f27ca8
commit e354066945
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/render/decorations/CHyprGroupBarDecoration.cpp
View file

@ -172,12 +172,13 @@ void CHyprGroupBarDecoration::draw(PHLMONITOR pMonitor, float const& a) {
rectdata.round = *PROUNDING; rectdata.round = *PROUNDING;
rectdata.roundingPower = *PROUNDINGPOWER; rectdata.roundingPower = *PROUNDINGPOWER;
if (*PROUNDONLYEDGES) { if (*PROUNDONLYEDGES) {
rectdata.round = 0;
const double offset = *PROUNDING * 2;
if (i == 0) { if (i == 0) {
rectdata.round = *PROUNDING; rectdata.round = *PROUNDING;
rectdata.clipBox = rect; rectdata.clipBox = rect;
rectdata.box = CBox{rect.pos(), Vector2D{rect.w + (*PROUNDING * 2), rect.h}}; rectdata.box = CBox{rect.pos(), Vector2D{rect.w + offset, rect.h}};
} else if (i == barsToDraw - 1) { } else if (i == barsToDraw - 1) {
double offset = *PROUNDING * 2;
rectdata.round = *PROUNDING; rectdata.round = *PROUNDING;
rectdata.clipBox = rect; rectdata.clipBox = rect;
rectdata.box = CBox{rect.pos() - Vector2D{offset, 0.F}, Vector2D{rect.w + offset, rect.h}}; rectdata.box = CBox{rect.pos() - Vector2D{offset, 0.F}, Vector2D{rect.w + offset, rect.h}};
@ -205,15 +206,16 @@ void CHyprGroupBarDecoration::draw(PHLMONITOR pMonitor, float const& a) {
data.round = *PGRADIENTROUNDING; data.round = *PGRADIENTROUNDING;
data.roundingPower = *PGRADIENTROUNDINGPOWER; data.roundingPower = *PGRADIENTROUNDINGPOWER;
if (*PGRADIENTROUNDINGONLYEDGES) { if (*PGRADIENTROUNDINGONLYEDGES) {
data.round = 0;
const double offset = *PGRADIENTROUNDING * 2;
if (i == 0) { if (i == 0) {
data.round = *PGRADIENTROUNDING; data.round = *PGRADIENTROUNDING;
data.clipBox = rect; data.clipBox = rect;
data.box = CBox{rect.pos(), Vector2D{rect.w + (*PGRADIENTROUNDING * 2), rect.h}}; data.box = CBox{rect.pos(), Vector2D{rect.w + offset, rect.h}};
} else if (i == barsToDraw - 1) { } else if (i == barsToDraw - 1) {
double offset = *PGRADIENTROUNDING * 2; data.round = *PGRADIENTROUNDING;
data.round = *PGRADIENTROUNDING; data.clipBox = rect;
data.clipBox = rect; data.box = CBox{rect.pos() - Vector2D{offset, 0.F}, Vector2D{rect.w + offset, rect.h}};
data.box = CBox{rect.pos() - Vector2D{offset, 0.F}, Vector2D{rect.w + offset, rect.h}};
} }
} }
} }