summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-03-06 03:55:38 +0100
committerPablo Barciela <[email protected]>2019-07-02 16:30:27 +0200
commit1f2352b9e8937ae2d8f24fc8a12be5717bd21528 (patch)
tree86e8b91bdfc2d8d9cef21ea942aa37571bebe976 /src
parentf4edb9de82a65b4ffc0c888ba70401475b1f6c50 (diff)
downloadmarco-1f2352b9e8937ae2d8f24fc8a12be5717bd21528.tar.bz2
marco-1f2352b9e8937ae2d8f24fc8a12be5717bd21528.tar.xz
boxes: Actually check for rectangle containment
Fixes condition duplicated: /* If a contains b, just remove b */ if (meta_rectangle_contains_rect (a, b)) { delete_me = other; } /* If b contains a, just remove a */ else if (meta_rectangle_contains_rect (a, b)) { delete_me = compare; }
Diffstat (limited to 'src')
-rw-r--r--src/core/boxes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/boxes.c b/src/core/boxes.c
index 93f7db44..19dd939e 100644
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -414,7 +414,7 @@ merge_spanning_rects_in_region (GList *region)
delete_me = other;
}
/* If b contains a, just remove a */
- else if (meta_rectangle_contains_rect (a, b))
+ else if (meta_rectangle_contains_rect (b, a))
{
delete_me = compare;
}