rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=4488f18238a1b8eba96b0081613e97f3655230f2
commit 4488f18238a1b8eba96b0081613e97f3655230f2 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Mon Nov 2 12:02:01 2015 +0200 editor: add resetters for state_text functions --- src/bin/editor/default.c | 15 ++++++++++++ src/bin/editor/default.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/src/bin/editor/default.c b/src/bin/editor/default.c index 8cad99f..9dc3b38 100644 --- a/src/bin/editor/default.c +++ b/src/bin/editor/default.c @@ -60,6 +60,9 @@ 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) #define EDITOR_INT_DEFAULT_CHECK(FUNC, PROTO_ARGS, ARGS, DEF_VAL) \ Eina_Bool \ @@ -97,6 +100,7 @@ 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) #define EDITOR_BOOL_DEFAULT_CHECK(FUNC, PROTO_ARGS, ARGS, DEF_VAL) \ Eina_Bool \ @@ -126,6 +130,12 @@ 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) #define EDITOR_NULL_STRING_DEFAULT_CHECK(FUNC, PROTO_ARGS, ARGS) \ Eina_Bool \ @@ -164,6 +174,11 @@ EDITOR_STATE_NULL_STRING_RESET(rel2_to_y, NULL) EDITOR_STATE_NULL_STRING_RESET(proxy_source, NULL) EDITOR_STATE_NULL_STRING_RESET(color_class, NULL) EDITOR_STATE_NULL_STRING_RESET(image, "") +EDITOR_STATE_NULL_STRING_RESET(text_source, NULL) +EDITOR_STATE_NULL_STRING_RESET(text_text_source, NULL) +EDITOR_STATE_NULL_STRING_RESET(text, NULL) +EDITOR_STATE_NULL_STRING_RESET(font, NULL) +EDITOR_STATE_NULL_STRING_RESET(text_style, NULL) #define EDITOR_INT_INT_INT_INT_DEFAULT_CHECK(FUNC, PROTO_ARGS, ARGS, DEF_VAL, DEF_VAL_2, DEF_VAL_3, DEF_VAL_4) \ Eina_Bool \ diff --git a/src/bin/editor/default.h b/src/bin/editor/default.h index 5d59b95..727fc41 100644 --- a/src/bin/editor/default.h +++ b/src/bin/editor/default.h @@ -87,6 +87,18 @@ Eina_Bool editor_state_minmul_w_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); Eina_Bool editor_state_minmul_w_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_align_x_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_align_x_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_align_y_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_align_y_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_elipsis_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_elipsis_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); Eina_Bool @@ -145,6 +157,10 @@ Eina_Bool editor_state_container_padding_y_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); Eina_Bool editor_state_container_padding_y_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_size_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_size_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); Eina_Bool @@ -171,6 +187,30 @@ Eina_Bool editor_state_container_min_v_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); Eina_Bool editor_state_container_min_v_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_fit_x_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_fit_x_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_fit_y_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_fit_y_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_max_x_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_max_x_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_max_y_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_max_y_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_min_x_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_min_x_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_min_y_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_min_y_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); Eina_Bool @@ -201,6 +241,26 @@ Eina_Bool editor_state_image_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); Eina_Bool editor_state_image_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_source_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_source_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_text_source_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_text_source_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_font_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_font_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_style_default_is(Evas_Object *edit_object, const char *part_name, const char *state_name, double state_val); +Eina_Bool +editor_state_text_style_reset(Evas_Object *edit_object, Change *change, const char *part_name, const char *state_name, double state_val); Eina_Bool --