diff options
| author | Jaeun Choi <jaeun12.choi@samsung.com> | 2018-01-16 13:19:36 +0900 |
|---|---|---|
| committer | Jaeun Choi <jaeun12.choi@samsung.com> | 2018-01-16 13:19:36 +0900 |
| commit | 65b828b050abc56a1aee4f722535de3e0bea5fbb (patch) | |
| tree | dfb926a26d8f64d98c6e0fd9576cab7ae9bd517b | |
| parent | 631eb3701d86b1d5b09b4a54c96b55a70fbe777e (diff) | |
| download | efl-65b828b050abc56a1aee4f722535de3e0bea5fbb.tar.gz | |
elm_panel: prevent redundant callback function addition or deletion
there is a need to check if callback functions already exist or not
before adding or deleting them, because they are added or deleted
at two points:
in _elm_panel_scrollable_set() and _elm_panel_elm_widget_disable().
| -rw-r--r-- | src/lib/elementary/elm_panel.c | 27 | ||||
| -rw-r--r-- | src/lib/elementary/elm_widget_panel.h | 1 |
2 files changed, 20 insertions, 8 deletions
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 79057b72d1..1ccf497193 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1227,7 +1227,7 @@ _elm_panel_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bo if (sd->scrollable) { - if (disabled) + if (disabled && sd->callback_added) { evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down); @@ -1237,8 +1237,10 @@ _elm_panel_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bo _on_mouse_up); evas_object_event_callback_del(sd->scr_event, EVAS_CALLBACK_MOUSE_UP, _event_mouse_up); + + sd->callback_added = EINA_FALSE; } - else + else if (!disabled && !sd->callback_added) { evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, sd); @@ -1248,6 +1250,8 @@ _elm_panel_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bo _on_mouse_up, sd); evas_object_event_callback_add(sd->scr_event, EVAS_CALLBACK_MOUSE_UP, _event_mouse_up, obj); + + sd->callback_added = EINA_TRUE; } } @@ -1370,7 +1374,7 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) elm_interface_scrollable_single_direction_set (obj, ELM_SCROLLER_SINGLE_DIRECTION_NONE); - if (!elm_widget_disabled_get(obj)) + if (!elm_widget_disabled_get(obj) && !sd->callback_added) { evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, sd); @@ -1380,6 +1384,8 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) _on_mouse_up, sd); evas_object_event_callback_add(sd->scr_event, EVAS_CALLBACK_MOUSE_UP, _event_mouse_up, obj); + + sd->callback_added = EINA_TRUE; } } @@ -1387,11 +1393,16 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) { elm_interface_scrollable_content_set(obj, NULL); - evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down); - evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move); - evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP, _on_mouse_up); - evas_object_event_callback_del(sd->scr_event, EVAS_CALLBACK_MOUSE_UP, - _event_mouse_up); + if (sd->callback_added) + { + evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down); + evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move); + evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP, _on_mouse_up); + evas_object_event_callback_del(sd->scr_event, EVAS_CALLBACK_MOUSE_UP, + _event_mouse_up); + + sd->callback_added = EINA_FALSE; + } elm_widget_resize_object_set(obj, NULL); elm_widget_sub_object_add(obj, sd->scr_edje); diff --git a/src/lib/elementary/elm_widget_panel.h b/src/lib/elementary/elm_widget_panel.h index 16847480a6..6aacb9b585 100644 --- a/src/lib/elementary/elm_widget_panel.h +++ b/src/lib/elementary/elm_widget_panel.h @@ -46,6 +46,7 @@ struct _Elm_Panel_Data Eina_Bool delete_me : 1; Eina_Bool scrollable : 1; Eina_Bool freeze: 1; + Eina_Bool callback_added: 1; }; /** |