seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2af33f20ed2fa9cdadf077c2161ae39e01739872
commit 2af33f20ed2fa9cdadf077c2161ae39e01739872 Author: Daniel Juyung Seo <seojuyu...@gmail.com> Date: Mon Nov 10 14:05:53 2014 +0900 macro: Fix wrong macro braces. This causes unwanted result. Fit it. --- src/lib/elm_macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_macros.h b/src/lib/elm_macros.h index 39e34af..859be13 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)))) --