hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=331ad370d7d0a2a491f2609f7057d58b1cdc65cc
commit 331ad370d7d0a2a491f2609f7057d58b1cdc65cc Author: ChunEon Park <[email protected]> Date: Wed Feb 25 22:08:52 2015 +0900 bin/live_edit: fix side effect. align lines are always visible. it's fixed. it's introduced from e858f46c0b9dbfe01d59edce3b655b12724ff1e9 --- src/bin/live_edit.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index 7852d6c..be44904 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -261,6 +261,8 @@ cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, if ((y - ld->half_ctrl_size) > rel2_y) y = (rel2_y + ld->half_ctrl_size); ld->part_info.rel1_y = ROUNDING(((double) (y - ly) / (double) lh), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Top], "elm,state,show", ""); } static void @@ -284,6 +286,9 @@ cp_bottom_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, if (rel1_y > (y + ld->half_ctrl_size)) y = (rel1_y + ld->half_ctrl_size); ld->part_info.rel2_y = ROUNDING(((double) (y - ly) / (double) lh), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Bottom], "elm,state,show", + ""); } static void @@ -301,7 +306,6 @@ align_line_update(live_data *ld) evas_object_move(ld->align_line[Align_Line_Top], (lx + 1), y); evas_object_resize(ld->align_line[Align_Line_Top], (lw - 2), (1 * elm_config_scale_get())); - elm_object_signal_emit(ld->align_line[Align_Line_Top], "elm,state,show", ""); //Bottom evas_object_geometry_get(ld->ctrl_pt[Ctrl_Pt_Bottom], NULL, &y, NULL, NULL); @@ -309,24 +313,18 @@ align_line_update(live_data *ld) evas_object_move(ld->align_line[Align_Line_Bottom], (lx + 1), (y - 1)); evas_object_resize(ld->align_line[Align_Line_Bottom], (lw - 2), (1 * elm_config_scale_get())); - elm_object_signal_emit(ld->align_line[Align_Line_Bottom], "elm,state,show", - ""); //Left evas_object_geometry_get(ld->ctrl_pt[Ctrl_Pt_Left], &x, NULL, NULL, NULL); x = round(((double) x) + ld->half_ctrl_size); evas_object_move(ld->align_line[Align_Line_Left], x, (ly + 1)); evas_object_resize(ld->align_line[Align_Line_Left], (1 * elm_config_scale_get()), (lh - 2)); - elm_object_signal_emit(ld->align_line[Align_Line_Left], "elm,state,show", - ""); //Right evas_object_geometry_get(ld->ctrl_pt[Ctrl_Pt_Right], &x, NULL, NULL, NULL); x = round(((double) x) + ld->half_ctrl_size); evas_object_move(ld->align_line[Align_Line_Right], (x - 1), (ly + 1)); evas_object_resize(ld->align_line[Align_Line_Right], (1 * elm_config_scale_get()), (lh - 2)); - elm_object_signal_emit(ld->align_line[Align_Line_Right], "elm,state,show", - ""); } static void @@ -354,6 +352,10 @@ cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, ld->part_info.rel1_x = ROUNDING(((double) (x - lx) / (double) lw), 2); ld->part_info.rel1_y = ROUNDING(((double) (y - ly) / (double) lh), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Left], "elm,state,show", + ""); + elm_object_signal_emit(ld->align_line[Align_Line_Top], "elm,state,show", ""); } static void @@ -381,6 +383,11 @@ cp_rel2_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, ld->part_info.rel2_x = ROUNDING(((double) (x - lx) / (double) lw), 2); ld->part_info.rel2_y = ROUNDING(((double) (y - ly) / (double) lh), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Right], "elm,state,show", + ""); + elm_object_signal_emit(ld->align_line[Align_Line_Bottom], "elm,state,show", + ""); } static void @@ -412,6 +419,10 @@ cp_rel3_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, ld->part_info.rel2_x = ROUNDING(((double) (x - lx) / (double) lw), 2); ld->part_info.rel1_y = ROUNDING(((double) (y - ly) / (double) lh), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Right], "elm,state,show", + ""); + elm_object_signal_emit(ld->align_line[Align_Line_Top], "elm,state,show", ""); } static void @@ -443,6 +454,11 @@ cp_rel4_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, ld->part_info.rel1_x = ROUNDING(((double) (x - lx) / (double) lw), 2); ld->part_info.rel2_y = ROUNDING(((double) (y - ly) / (double) lh), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Left], "elm,state,show", + ""); + elm_object_signal_emit(ld->align_line[Align_Line_Bottom], "elm,state,show", + ""); } static void @@ -466,6 +482,9 @@ cp_left_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, if ((x - ld->half_ctrl_size) > rel2_x) x = (rel2_x + ld->half_ctrl_size); ld->part_info.rel1_x = ROUNDING(((double) (x - lx) / (double) lw), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Left], "elm,state,show", + ""); } static void @@ -489,6 +508,9 @@ cp_right_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, if (rel1_x > (x + ld->half_ctrl_size)) x = (rel1_x + ld->half_ctrl_size); ld->part_info.rel2_x = ROUNDING(((double) (x - lx) / (double) lw), 2); + + elm_object_signal_emit(ld->align_line[Align_Line_Right], "elm,state,show", + ""); } static void @@ -690,6 +712,14 @@ layout_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, evas_object_move(obj, x, y); + elm_object_signal_emit(ld->align_line[Align_Line_Top], "elm,state,show", ""); + elm_object_signal_emit(ld->align_line[Align_Line_Bottom], "elm,state,show", + ""); + elm_object_signal_emit(ld->align_line[Align_Line_Left], "elm,state,show", + ""); + elm_object_signal_emit(ld->align_line[Align_Line_Right], "elm,state,show", + ""); + ctrl_pt_update(ld); info_text_update(ld); align_line_update(ld); --
