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

snap: check which corner is being grabbed for monitor snapping (#8637)

Browse source
This commit is contained in:
Mike Will 2024-12-04 13:12:04 -05:00 • committed by GitHub
parent 3c617ce33c
commit f9e4998a6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/layout/IHyprLayout.cpp
View file

@ -487,19 +487,23 @@ static void performSnap(Vector2D& sourcePos, Vector2D& sourceSize, PHLWINDOW DRA
SRange monX = {MON->vecPosition.x + BORDERSIZE, MON->vecPosition.x + MON->vecSize.x - BORDERSIZE}; SRange monX = {MON->vecPosition.x + BORDERSIZE, MON->vecPosition.x + MON->vecSize.x - BORDERSIZE};
SRange monY = {MON->vecPosition.y + BORDERSIZE, MON->vecPosition.y + MON->vecSize.y - BORDERSIZE}; SRange monY = {MON->vecPosition.y + BORDERSIZE, MON->vecPosition.y + MON->vecSize.y - BORDERSIZE};
if (canSnap(sourceX.start, monX.start, GAPSIZE) || canSnap(sourceX.start, (monX.start += MON->vecReservedTopLeft.x + BORDERDIFF), GAPSIZE)) { if (CORNER & (CORNER_TOPLEFT | CORNER_BOTTOMLEFT) &&
(canSnap(sourceX.start, monX.start, GAPSIZE) || canSnap(sourceX.start, (monX.start += MON->vecReservedTopLeft.x + BORDERDIFF), GAPSIZE))) {
SNAP(sourceX.start, sourceX.end, monX.start); SNAP(sourceX.start, sourceX.end, monX.start);
snaps |= SNAP_LEFT; snaps |= SNAP_LEFT;
} }
if (canSnap(sourceX.end, monX.end, GAPSIZE) || canSnap(sourceX.end, (monX.end -= MON->vecReservedBottomRight.x + BORDERDIFF), GAPSIZE)) { if (CORNER & (CORNER_TOPRIGHT | CORNER_BOTTOMRIGHT) &&
(canSnap(sourceX.end, monX.end, GAPSIZE) || canSnap(sourceX.end, (monX.end -= MON->vecReservedBottomRight.x + BORDERDIFF), GAPSIZE))) {
SNAP(sourceX.end, sourceX.start, monX.end); SNAP(sourceX.end, sourceX.start, monX.end);
snaps |= SNAP_RIGHT; snaps |= SNAP_RIGHT;
} }
if (canSnap(sourceY.start, monY.start, GAPSIZE) || canSnap(sourceY.start, (monY.start += MON->vecReservedTopLeft.y + BORDERDIFF), GAPSIZE)) { if (CORNER & (CORNER_TOPLEFT | CORNER_TOPRIGHT) &&
(canSnap(sourceY.start, monY.start, GAPSIZE) || canSnap(sourceY.start, (monY.start += MON->vecReservedTopLeft.y + BORDERDIFF), GAPSIZE))) {
SNAP(sourceY.start, sourceY.end, monY.start); SNAP(sourceY.start, sourceY.end, monY.start);
snaps |= SNAP_UP; snaps |= SNAP_UP;
} }
if (canSnap(sourceY.end, monY.end, GAPSIZE) || canSnap(sourceY.end, (monY.end -= MON->vecReservedBottomRight.y + BORDERDIFF), GAPSIZE)) { if (CORNER & (CORNER_BOTTOMLEFT | CORNER_BOTTOMRIGHT) &&
(canSnap(sourceY.end, monY.end, GAPSIZE) || canSnap(sourceY.end, (monY.end -= MON->vecReservedBottomRight.y + BORDERDIFF), GAPSIZE))) {
SNAP(sourceY.end, sourceY.start, monY.end); SNAP(sourceY.end, sourceY.start, monY.end);
snaps |= SNAP_DOWN; snaps |= SNAP_DOWN;
} }