diff options
| author | Daniel Juyung Seo <seojuyung2@gmail.com> | 2014-11-10 14:05:53 +0900 |
|---|---|---|
| committer | Daniel Juyung Seo <seojuyung2@gmail.com> | 2014-11-10 14:05:58 +0900 |
| commit | 2af33f20ed2fa9cdadf077c2161ae39e01739872 (patch) | |
| tree | df2d77dfd42832dc6a3f9ff56d5b4627759f1a3e | |
| parent | 3c3bd660d9efc889728f413f613506ffe35d30b5 (diff) | |
| download | elementary-2af33f20ed2fa9cdadf077c2161ae39e01739872.tar.gz | |
macro: Fix wrong macro braces.
This causes unwanted result. Fit it.
| -rw-r--r-- | src/lib/elm_macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/elm_macros.h b/src/lib/elm_macros.h index 39e34af6f..859be1324 100644 --- a/src/lib/elm_macros.h +++ b/src/lib/elm_macros.h @@ -1,7 +1,7 @@ /* handy macros */ #define ELM_RECTS_INTERSECT(x, y, w, h, xx, yy, ww, hh) (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy))) #define ELM_PI 3.14159265358979323846 -#define ELM_SCALE_SIZE(x) ((x) / (elm_app_base_scale_get() * elm_config_scale_get())) +#define ELM_SCALE_SIZE(x) (((x) / elm_app_base_scale_get()) * elm_config_scale_get()) // checks if the point(xx, yy) stays out of the rectangle(x, y, w, h) area. #define ELM_RECTS_POINT_OUT(x, y, w, h, xx, yy) (((xx) < (x)) || ((yy) < (y)) || ((xx) > ((x) + (w))) || ((yy) > ((y) + (h)))) |