diff options
| author | Mike Will <myQwil@gmail.com> | 2024-12-27 16:49:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-27 21:49:45 +0000 |
| commit | cca0adf6a37c33fb12514b7935fa372fda27d97f (patch) | |
| tree | 1daddc37fd285b8c33326714ad4f527a58936be5 /src/layout/IHyprLayout.cpp | |
| parent | 534adad6b1940fcf0929a59be62dc78e5effaccc (diff) | |
snap: revert #8659, use bounds checking instead of bit mask (#8872)
They seem like the same check, but a snap bit might not be
turned on as expected if we grab a different corner after
an edge has already been snapped.
Diffstat (limited to 'src/layout/IHyprLayout.cpp')
| -rw-r--r-- | src/layout/IHyprLayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp index 354fc09f..2d6e9561 100644 --- a/src/layout/IHyprLayout.cpp +++ b/src/layout/IHyprLayout.cpp @@ -457,7 +457,7 @@ static void performSnap(Vector2D& sourcePos, Vector2D& sourceSize, PHLWINDOW DRA // corner snapping const double BORDERDIFF = OTHERBORDERSIZE - DRAGGINGBORDERSIZE; - if (snaps & (SNAP_LEFT | SNAP_RIGHT)) { + if (sourceX.start == SURFBX.end || SURFBX.start == sourceX.end) { const SRange SURFY = {SURF.y - BORDERDIFF, SURF.y + SURF.h + BORDERDIFF}; if (CORNER & (CORNER_TOPLEFT | CORNER_TOPRIGHT) && canSnap(sourceY.start, SURFY.start, GAPSIZE)) { SNAP(sourceY.start, sourceY.end, SURFY.start); @@ -467,7 +467,7 @@ static void performSnap(Vector2D& sourcePos, Vector2D& sourceSize, PHLWINDOW DRA snaps |= SNAP_DOWN; } } - if (snaps & (SNAP_UP | SNAP_DOWN)) { + if (sourceY.start == SURFBY.end || SURFBY.start == sourceY.end) { const SRange SURFX = {SURF.x - BORDERDIFF, SURF.x + SURF.w + BORDERDIFF}; if (CORNER & (CORNER_TOPLEFT | CORNER_BOTTOMLEFT) && canSnap(sourceX.start, SURFX.start, GAPSIZE)) { SNAP(sourceX.start, sourceX.end, SURFX.start); |