diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-17 10:33:39 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-17 10:33:39 -0500 |
| commit | 501943b53d68821a752ceda3fbd9b64bbcae4a4c (patch) | |
| tree | a2a2d4a8d5fd2976f4e1cfb7801c8adca457d19d /openbox/geom.h | |
| parent | 1a348576400b26dad3a58a81415c4c833fb4915c (diff) | |
| parent | d3347e8be3753b7a466353aece04a25992018c9a (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'openbox/geom.h')
| -rw-r--r-- | openbox/geom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbox/geom.h b/openbox/geom.h index 7c5ee32e..6a1725e8 100644 --- a/openbox/geom.h +++ b/openbox/geom.h @@ -160,6 +160,6 @@ typedef struct _StrutPartial { (s1).bottom_end == (s2).bottom_end) #define RANGES_INTERSECT(r1x, r1w, r2x, r2w) \ - (r1x < r2x + r2w && r1x + r1w > r2x) + (r1w && r2w && r1x < r2x + r2w && r1x + r1w > r2x) #endif |