summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwoochan lee <wc0917.lee@samsung.com>2015-02-03 11:38:21 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-02-03 11:38:21 +0900
commit17a63524c08b6fc400b16cbb0acd8a32fe7e7bba (patch)
tree77c8c45ffa03b90ea1e4b47438dfad43643d3253
parentbc605e439b738776ea3eb4e07273c19d807b47d3 (diff)
multibuttonentry: Delete duplicate running code.
Summary: When layout clicked, "elm_widget_on_focus()" called with "entry_focus_in()" callback. The "view update" and "focus set to entry" already call in those callbacks, so i deleted duplicate code and it also make focus issue when user click the entry to add item. @fix Test Plan: Run elementary_test. 1. excute multibuttonentry. 2. click the entry area. 3. see the elm_widget_on_focus called twice. (layout callback function called view update -> elm_box_unpack called in view update -> entry lose focus -> on_focus_callback call again) Reviewers: Hermet, seoz, Jaehyun_Cho, JackDanielZ Differential Revision: https://phab.enlightenment.org/D1902
-rw-r--r--src/lib/elc_multibuttonentry.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 51d1d74a0..d53f44b76 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -881,21 +881,11 @@ _elm_multibuttonentry_elm_layout_sizing_eval(Eo *obj, Elm_Multibuttonentry_Data
881} 881}
882 882
883static void 883static void
884_mouse_clicked_signal_cb(void *data, 884_mouse_clicked_signal_cb(void *data EINA_UNUSED,
885 Evas_Object *obj, 885 Evas_Object *obj,
886 const char *emission EINA_UNUSED, 886 const char *emission EINA_UNUSED,
887 const char *source EINA_UNUSED) 887 const char *source EINA_UNUSED)
888{ 888{
889 Elm_Multibuttonentry_Data *sd = data;
890
891 _view_update(sd);
892
893 if (elm_widget_focus_get(obj) && sd->editable)
894 {
895 elm_entry_input_panel_show(sd->entry);
896 elm_object_focus_set(sd->entry, EINA_TRUE);
897 }
898
899 evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); 889 evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
900} 890}
901 891
@@ -1071,7 +1061,7 @@ _callbacks_register(Evas_Object *obj)
1071 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1061 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1072 1062
1073 elm_layout_signal_callback_add 1063 elm_layout_signal_callback_add
1074 (obj, "mouse,clicked,1", "*", _mouse_clicked_signal_cb, sd); 1064 (obj, "mouse,clicked,1", "*", _mouse_clicked_signal_cb, NULL);
1075 1065
1076 evas_object_event_callback_add 1066 evas_object_event_callback_add
1077 (wd->resize_obj, EVAS_CALLBACK_KEY_DOWN, 1067 (wd->resize_obj, EVAS_CALLBACK_KEY_DOWN,