[Call UI] Overstep edje issue with wrong displaying Compose new message reject message

Change-Id: Ib3cce1e0cfb053ec5544e1eba2e5f2823d50f27a

diff --git a/edje_src/edc/call_edc/callui_view_incoming_active.edc b/edje_src/edc/call_edc/callui_view_incoming_active.edc
index e94cb94..fce639f 100644 (file)
--- a/edje_src/edc/call_edc/callui_view_incoming_active.edc
+++ b/edje_src/edc/call_edc/callui_view_incoming_active.edc
@@ -71,8 +71,7 @@ styles {
        }
 }
 
-group {
-       name: "reject_msg_item";
+group { name: "reject_msg_item";
        parts {
                CU_PART_BASE_WH(AN_MAX_W, ACTIVE_NOTI_RM_ITEM_HEIGHT)
                CU_SWALLOW_BG
@@ -97,7 +96,64 @@ group {
                                text.style:"reject_msg_txt";
                                text.min: 0 1;
                        }
-                       description { state: "icon_enable" 0.0;
+               )
+               CU_PART_RECT( "ec.events",
+                       mouse_events: 1;
+                       repeat_events: 1;
+                       description {
+                               state: "default" 0.0;
+                               color: COLOR_BG_ALPHA;
+                       }
+               )
+       }
+       programs {
+               program { name: "mouse_down";
+                       signal: "mouse,down,*";
+                       source: "ec.events";
+                       action: STATE_SET "press" 0.0;
+                       target: "press_rect";
+               }
+               program { name: "mouse_up";
+                       signal: "mouse,up,*";
+                       source: "ec.events";
+                       action: STATE_SET "default" 0.0;
+                       target: "press_rect";
+               }
+               program { name: "mouse_move";
+                       signal: "mouse,move,*";
+                       source: "ec.events";
+                       action: STATE_SET "default" 0.0;
+                       target: "press_rect";
+               }
+               program { name: "clicked";
+                       signal: "mouse,clicked,1";
+                       source: "ec.events";
+                       action: SIGNAL_EMIT "cu,action,clicked" "main_active_noti_call";
+               }
+       }
+}
+
+// TODO: temporary solution to overstep edje signal handling problem.
+
+group { name: "reject_msg_item_compose";
+       parts {
+               CU_PART_BASE_WH(AN_MAX_W, ACTIVE_NOTI_RM_ITEM_HEIGHT)
+               CU_SWALLOW_BG
+               CU_PART_PADDING_LEFT(AN_RM_ITEM_PAD_LEFT)
+               CU_PART_PADDING_RIGHT(AN_RM_ITEM_PAD_RIGHT)
+               CU_PART_RECT( "press_rect",
+                       description { state: "default" 0.0;
+                               rel1 { relative: 0.0 0.0; to_x: "base"; }
+                               rel2 { relative: 1.0 1.0; to_x: "base"; }
+                               color: COLOR_BG_ALPHA;
+                       }
+                       description { state: "press" 0.0;
+                               inherit: "default" 0.0;
+                               color: AO033P;
+                       }
+               )
+               CU_PART_TEXTBLOCK( "callui.text.main",
+                       description { state: "default" 0.0;
                                align: 0.0 0.5;
                                rel1 { relative: 1.0 0.0; to_x: "padding.left"; }
                                rel2 { relative: 0.0 1.0; to_x: "add_icon.pad.left"; }
@@ -115,7 +171,6 @@ group {
                )
                CU_PART_IMAGE( "add_icon",
                        description { state: "default" 0.0;
-                               visible: 0;
                                align: 1.0 0.5;
                                aspect_preference: BOTH;
                                rel1 { relative: 0.0 0.0; to_x: "add_icon.pad.right"; }
@@ -124,10 +179,6 @@ group {
                                max: AN_RM_ITEM_ADD_ICON_SIZE;
                                image.normal: IMG_SRC_DIR/"core_button_add.png";
                        }
-                       description { state: "show" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 1;
-                       }
                )
                CU_PART_SPACER( "add_icon.pad.left",
                        description { state: "default" 0.0;
@@ -171,17 +222,6 @@ group {
                        source: "ec.events";
                        action: SIGNAL_EMIT "cu,action,clicked" "main_active_noti_call";
                }
-               program { name: "change_text_pos_with_icon";
-                       action: STATE_SET "icon_enable" 0.0;
-                       target: "callui.text.main";
-               }
-               program { name: "show_add_icon";
-                       signal: "show_add_icon";
-                       source: "";
-                       action: STATE_SET "show" 0.0;
-                       target: "add_icon";
-                       after: "change_text_pos_with_icon";
-               }
        }
 }
 

diff --git a/src/callui-view-incoming-call-noti.c b/src/callui-view-incoming-call-noti.c
index c235285..8c95f2e 100644 (file)
--- a/src/callui-view-incoming-call-noti.c
+++ b/src/callui-view-incoming-call-noti.c
@@ -602,12 +602,11 @@ static callui_result_e __rm_create_message_items(callui_view_incoming_call_noti_
 
 static callui_result_e __rm_create_compose_item(callui_view_incoming_call_noti_h vd, Evas_Object *box)
 {
-       Evas_Object *item_ly = _callui_load_edj(vd->box, CALLUI_CALL_EDJ_PATH, "reject_msg_item");
+       Evas_Object *item_ly = _callui_load_edj(vd->box, CALLUI_CALL_EDJ_PATH, "reject_msg_item_compose");
        CALLUI_RETURN_VALUE_IF_FAIL(item_ly, CALLUI_RESULT_FAIL);
 
        evas_object_size_hint_weight_set(item_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(item_ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_object_signal_emit(item_ly, "show_add_icon", "");
        elm_layout_signal_callback_add(item_ly, "cu,action,clicked", "main_active_noti_call", _rm_compose_item_clicked_cb, vd->base_view.ad);
 
        elm_object_translatable_part_text_set(item_ly, "callui.text.main", "IDS_CALL_BUTTON_COMPOSE_MESSAGE_TO_SEND_ABB");