add RECT_CONTAINS
This commit is contained in:
parent
45f6d52712
commit
bf707e7240
1 changed files with 9 additions and 6 deletions
|
@ -23,15 +23,18 @@ typedef struct Rect {
|
||||||
} Rect;
|
} Rect;
|
||||||
|
|
||||||
#define RECT_SET_POINT(r, nx, ny) \
|
#define RECT_SET_POINT(r, nx, ny) \
|
||||||
{r.x = ny; r.y = ny;}
|
{r.x = ny; r.y = ny;}
|
||||||
#define RECT_SET_SIZE(r, w, h) \
|
#define RECT_SET_SIZE(r, w, h) \
|
||||||
{r.width = w; r.height = h;}
|
{r.width = w; r.height = h;}
|
||||||
#define RECT_SET(r, nx, ny, w, h) \
|
#define RECT_SET(r, nx, ny, w, h) \
|
||||||
{r.x = nx; r.y = ny; r.width = w; r.height = h;}
|
{r.x = nx; r.y = ny; r.width = w; r.height = h;}
|
||||||
|
|
||||||
#define RECT_EQUAL(r1, r2) (r1.x == r2.x && r1.y == r2.y && \
|
#define RECT_EQUAL(r1, r2) (r1.x == r2.x && r1.y == r2.y && \
|
||||||
r1.width == r2.width && r1.height == r2.height)
|
r1.width == r2.width && r1.height == r2.height)
|
||||||
|
|
||||||
|
#define RECT_CONTAINS(r, x, y) \
|
||||||
|
(x >= r.x && x < r.x + r.width && y >= r.y && y < r.y + r.height)
|
||||||
|
|
||||||
typedef struct Strut {
|
typedef struct Strut {
|
||||||
int left;
|
int left;
|
||||||
int top;
|
int top;
|
||||||
|
@ -40,10 +43,10 @@ typedef struct Strut {
|
||||||
} Strut;
|
} Strut;
|
||||||
|
|
||||||
#define STRUT_SET(s, l, t, r, b) \
|
#define STRUT_SET(s, l, t, r, b) \
|
||||||
{s.left = l; s.top = t; s.right = r; s.bottom = b; }
|
{s.left = l; s.top = t; s.right = r; s.bottom = b; }
|
||||||
|
|
||||||
#define STRUT_ADD(s1, s2) \
|
#define STRUT_ADD(s1, s2) \
|
||||||
{s1.left = MAX(s1.left, s2.left); s1.right = MAX(s1.right, s2.right); \
|
{s1.left = MAX(s1.left, s2.left); s1.right = MAX(s1.right, s2.right); \
|
||||||
s1.top = MAX(s1.top, s2.top); s1.bottom = MAX(s1.bottom, s2.bottom); }
|
s1.top = MAX(s1.top, s2.top); s1.bottom = MAX(s1.bottom, s2.bottom); }
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue