rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=97b6dc9f66d1db8b21e62dbf6fc16737caf49b1c
commit 97b6dc9f66d1db8b21e62dbf6fc16737caf49b1c Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Tue Nov 17 11:59:14 2015 +0200 editor: remove separate vaulue for resseting to default --- src/bin/editor/default.c | 122 +++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/src/bin/editor/default.c b/src/bin/editor/default.c index d077057..d448d57 100644 --- a/src/bin/editor/default.c +++ b/src/bin/editor/default.c @@ -40,29 +40,29 @@ editor_##FUNC##_reset(Evas_Object *edit_object, Change *change, PROTO_ARGS) \ return editor_##FUNC##_set(edit_object, change, false, ARGS, RESET_VAL); \ } -#define EDITOR_STATE_DOUBLE_RESET(FUNC, DEF_VAL, RESET_VAL) \ +#define EDITOR_STATE_DOUBLE_RESET(FUNC, DEF_VAL) \ EDITOR_DOUBLE_DEFAULT_CHECK(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) \ -EDITOR_DOUBLE_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, RESET_VAL) - -EDITOR_STATE_DOUBLE_RESET(rel1_relative_x, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(rel2_relative_x, 1.0, 1.0) -EDITOR_STATE_DOUBLE_RESET(rel1_relative_y, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(rel2_relative_y, 1.0, 1.0) -EDITOR_STATE_DOUBLE_RESET(align_x, 0.5, 0.5) -EDITOR_STATE_DOUBLE_RESET(align_y, 0.5, 0.5) -EDITOR_STATE_DOUBLE_RESET(aspect_min, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(aspect_max, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(fill_origin_relative_x, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(fill_origin_relative_y, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(fill_size_relative_x, 1.0, 1.0) -EDITOR_STATE_DOUBLE_RESET(fill_size_relative_y, 1.0, 1.0) -EDITOR_STATE_DOUBLE_RESET(container_align_x, 0.5, 0.5) -EDITOR_STATE_DOUBLE_RESET(container_align_y, 0.5, 0.5) -EDITOR_STATE_DOUBLE_RESET(minmul_h, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(minmul_w, 0.0, 0.0) -EDITOR_STATE_DOUBLE_RESET(text_align_x, 0.5, 0.5) -EDITOR_STATE_DOUBLE_RESET(text_align_y, 0.5, 0.5) -EDITOR_STATE_DOUBLE_RESET(text_elipsis, 0.0, 0.0) +EDITOR_DOUBLE_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) + +EDITOR_STATE_DOUBLE_RESET(rel1_relative_x, 0.0) +EDITOR_STATE_DOUBLE_RESET(rel2_relative_x, 1.0) +EDITOR_STATE_DOUBLE_RESET(rel1_relative_y, 0.0) +EDITOR_STATE_DOUBLE_RESET(rel2_relative_y, 1.0) +EDITOR_STATE_DOUBLE_RESET(align_x, 0.5) +EDITOR_STATE_DOUBLE_RESET(align_y, 0.5) +EDITOR_STATE_DOUBLE_RESET(aspect_min, 0.0) +EDITOR_STATE_DOUBLE_RESET(aspect_max, 0.0) +EDITOR_STATE_DOUBLE_RESET(fill_origin_relative_x, 0.0) +EDITOR_STATE_DOUBLE_RESET(fill_origin_relative_y, 0.0) +EDITOR_STATE_DOUBLE_RESET(fill_size_relative_x, 1.0) +EDITOR_STATE_DOUBLE_RESET(fill_size_relative_y, 1.0) +EDITOR_STATE_DOUBLE_RESET(container_align_x, 0.5) +EDITOR_STATE_DOUBLE_RESET(container_align_y, 0.5) +EDITOR_STATE_DOUBLE_RESET(minmul_h, 0.0) +EDITOR_STATE_DOUBLE_RESET(minmul_w, 0.0) +EDITOR_STATE_DOUBLE_RESET(text_align_x, 0.5) +EDITOR_STATE_DOUBLE_RESET(text_align_y, 0.5) +EDITOR_STATE_DOUBLE_RESET(text_elipsis, 0.0) #define EDITOR_INT_DEFAULT_CHECK(FUNC, PROTO_ARGS, ARGS, DEF_VAL) \ Eina_Bool \ @@ -82,25 +82,25 @@ editor_##FUNC##_reset(Evas_Object *edit_object, Change *change, PROTO_ARGS) \ return editor_##FUNC##_set(edit_object, change, false, ARGS, RESET_VAL); \ } -#define EDITOR_STATE_INT_RESET(FUNC, DEF_VAL, RESET_VAL) \ +#define EDITOR_STATE_INT_RESET(FUNC, DEF_VAL) \ EDITOR_INT_DEFAULT_CHECK(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) \ -EDITOR_INT_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, RESET_VAL) - -EDITOR_STATE_INT_RESET(rel1_offset_x, 0, 0) -EDITOR_STATE_INT_RESET(rel1_offset_y, 0, 0) -EDITOR_STATE_INT_RESET(rel2_offset_x, -1, -1) -EDITOR_STATE_INT_RESET(rel2_offset_y, -1, -1) -EDITOR_STATE_INT_RESET(max_w, -1, -1) -EDITOR_STATE_INT_RESET(max_h, -1, -1) -EDITOR_STATE_INT_RESET(min_w, 0, 0) -EDITOR_STATE_INT_RESET(min_h, 0, 0) -EDITOR_STATE_INT_RESET(fill_origin_offset_x, 0, 0) -EDITOR_STATE_INT_RESET(fill_origin_offset_y, 0, 0) -EDITOR_STATE_INT_RESET(fill_size_offset_x, -1, -1) -EDITOR_STATE_INT_RESET(fill_size_offset_y, -1, -1) -EDITOR_STATE_INT_RESET(container_padding_x, 0, 0) -EDITOR_STATE_INT_RESET(container_padding_y, 0, 0) -EDITOR_STATE_INT_RESET(text_size, 0, 0) +EDITOR_INT_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) + +EDITOR_STATE_INT_RESET(rel1_offset_x, 0) +EDITOR_STATE_INT_RESET(rel1_offset_y, 0) +EDITOR_STATE_INT_RESET(rel2_offset_x, -1) +EDITOR_STATE_INT_RESET(rel2_offset_y, -1) +EDITOR_STATE_INT_RESET(max_w, -1) +EDITOR_STATE_INT_RESET(max_h, -1) +EDITOR_STATE_INT_RESET(min_w, 0) +EDITOR_STATE_INT_RESET(min_h, 0) +EDITOR_STATE_INT_RESET(fill_origin_offset_x, 0) +EDITOR_STATE_INT_RESET(fill_origin_offset_y, 0) +EDITOR_STATE_INT_RESET(fill_size_offset_x, -1) +EDITOR_STATE_INT_RESET(fill_size_offset_y, -1) +EDITOR_STATE_INT_RESET(container_padding_x, 0) +EDITOR_STATE_INT_RESET(container_padding_y, 0) +EDITOR_STATE_INT_RESET(text_size, 0) #define EDITOR_BOOL_DEFAULT_CHECK(FUNC, PROTO_ARGS, ARGS, DEF_VAL) \ Eina_Bool \ @@ -120,22 +120,22 @@ editor_##FUNC##_reset(Evas_Object *edit_object, Change *change, PROTO_ARGS) \ return editor_##FUNC##_set(edit_object, change, false, ARGS, RESET_VAL); \ } -#define EDITOR_STATE_BOOL_RESET(FUNC, DEF_VAL, RESET_VAL) \ +#define EDITOR_STATE_BOOL_RESET(FUNC, DEF_VAL) \ EDITOR_BOOL_DEFAULT_CHECK(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) \ -EDITOR_BOOL_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, RESET_VAL) - -EDITOR_STATE_BOOL_RESET(fixed_h, false, false) -EDITOR_STATE_BOOL_RESET(fixed_w, false, false) -EDITOR_STATE_BOOL_RESET(fill_smooth, true, true) -EDITOR_STATE_BOOL_RESET(visible, true, true) -EDITOR_STATE_BOOL_RESET(container_min_h, false, false) -EDITOR_STATE_BOOL_RESET(container_min_v, false, false) -EDITOR_STATE_BOOL_RESET(text_fit_x, false, false) -EDITOR_STATE_BOOL_RESET(text_fit_y, false, false) -EDITOR_STATE_BOOL_RESET(text_max_x, false, false) -EDITOR_STATE_BOOL_RESET(text_max_y, false, false) -EDITOR_STATE_BOOL_RESET(text_min_x, false, false) -EDITOR_STATE_BOOL_RESET(text_min_y, false, false) +EDITOR_BOOL_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) + +EDITOR_STATE_BOOL_RESET(fixed_h, false) +EDITOR_STATE_BOOL_RESET(fixed_w, false) +EDITOR_STATE_BOOL_RESET(fill_smooth, true) +EDITOR_STATE_BOOL_RESET(visible, true) +EDITOR_STATE_BOOL_RESET(container_min_h, false) +EDITOR_STATE_BOOL_RESET(container_min_v, false) +EDITOR_STATE_BOOL_RESET(text_fit_x, false) +EDITOR_STATE_BOOL_RESET(text_fit_y, false) +EDITOR_STATE_BOOL_RESET(text_max_x, false) +EDITOR_STATE_BOOL_RESET(text_max_y, false) +EDITOR_STATE_BOOL_RESET(text_min_x, false) +EDITOR_STATE_BOOL_RESET(text_min_y, false) #define EDITOR_NULL_STRING_DEFAULT_CHECK(FUNC, PROTO_ARGS, ARGS) \ Eina_Bool \ @@ -227,11 +227,11 @@ editor_##FUNC##_reset(Evas_Object *edit_object, Change *change, PROTO_ARGS) \ return editor_##FUNC##_set(edit_object, change, false, ARGS, RESET_VAL); \ } -#define EDITOR_STATE_UCHAR_RESET(FUNC, DEF_VAL, RESET_VAL) \ +#define EDITOR_STATE_UCHAR_RESET(FUNC, DEF_VAL) \ EDITOR_UCHAR_DEFAULT_CHECK(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) \ -EDITOR_UCHAR_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, RESET_VAL) +EDITOR_UCHAR_RESET(state_##FUNC, EDITOR_STATE_ARGS_PROTO, EDITOR_STATE_ARGS, DEF_VAL) -EDITOR_STATE_UCHAR_RESET(image_border_fill, 0, 0) -EDITOR_STATE_UCHAR_RESET(fill_type, 0, 0) -EDITOR_STATE_UCHAR_RESET(aspect_pref, 0, 0) -EDITOR_STATE_UCHAR_RESET(table_homogeneous, 0, 0) +EDITOR_STATE_UCHAR_RESET(image_border_fill, 0) +EDITOR_STATE_UCHAR_RESET(fill_type, 0) +EDITOR_STATE_UCHAR_RESET(aspect_pref, 0) +EDITOR_STATE_UCHAR_RESET(table_homogeneous, 0) --