diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2019-08-23 13:22:31 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-08-23 13:38:33 -0400 |
commit | e2b6e18577ea8d9b34142a57cca49c4b3a94df71 (patch) | |
tree | ce59308be15f3f9011a7d2776f2b27f9d8ae2d0c | |
parent | 235e2dbed01927b53010db85d62efa97c0ff33b7 (diff) | |
download | efl-e2b6e18577ea8d9b34142a57cca49c4b3a94df71.tar.gz |
efl_ui/scroll_util: block scroll calc tsunamis caused by repeat signal emits
Summary:
the 'efl,action,scroll' signal should only occur (at most) one time during
each signal process loop, so restrict it for this case
furthermore, the bar pos_changed and size_changed callbacks are always
triggered sequentially, so there's no need to emit the signal in both
callbacks
this fixes infinite edje embryo errors and massively improves scroll perf
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric, #reviewers, #committers
Tags: #efl_widgets
Differential Revision: https://phab.enlightenment.org/D9681
-rw-r--r-- | src/lib/elementary/efl_ui_scroll_util.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_scroll_util.c b/src/lib/elementary/efl_ui_scroll_util.c index 8ae867625f..9eacd20ff2 100644 --- a/src/lib/elementary/efl_ui_scroll_util.c +++ b/src/lib/elementary/efl_ui_scroll_util.c @@ -12,6 +12,8 @@ typedef struct { Eo *obj; Eo *smanager; int freeze_want; + Eina_Bool scroll_count : 1; + Eina_Bool need_scroll : 1; } Scroll_Connector_Context; static void @@ -52,6 +54,21 @@ _scroll_connector_edje_drag_cb(void *data, _scroll_connector_bar_read_and_update(ctx); } + +static void +_scroll(void *data, + Evas_Object *obj, + const char *emission EINA_UNUSED, + const char *source EINA_UNUSED) +{ + Scroll_Connector_Context *ctx = data; + + ctx->scroll_count = EINA_FALSE; + if (!ctx->need_scroll) return; + ctx->need_scroll = EINA_FALSE; + efl_layout_signal_emit(obj, "efl,action,scroll", "efl"); +} + static void _scroll_connector_edje_drag_start_cb(void *data, Evas_Object *obj EINA_UNUSED, @@ -170,7 +187,6 @@ _scroll_connector_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UN efl_ui_scrollbar_bar_size_get(ctx->smanager, &width, &height); edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width, 1.0); edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0, height); - efl_layout_signal_emit(wd->resize_obj, "efl,action,scroll", "efl"); } static void @@ -194,7 +210,13 @@ _scroll_connector_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNU efl_ui_scrollbar_bar_position_get(ctx->smanager, &posx, &posy); edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx, 0.0); edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0, posy); - efl_layout_signal_emit(wd->resize_obj, "efl,action,scroll", "efl"); + if (ctx->scroll_count) + ctx->need_scroll = EINA_TRUE; + else + { + efl_layout_signal_emit(wd->resize_obj, "efl,action,scroll", "efl"); + ctx->scroll_count = EINA_TRUE; + } } static void @@ -266,6 +288,9 @@ efl_ui_scroll_connector_bind(Eo *obj, Eo *manager) ctx, _scroll_connector_hbar_press_cb, NULL); efl_layout_signal_callback_add(obj, "efl,hbar,unpress", "efl", ctx, _scroll_connector_hbar_unpress_cb, NULL); + efl_layout_signal_callback_add(obj, "efl,action,scroll", "efl", + ctx, _scroll, NULL); + //from the object to the theme efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_SIZE_CHANGED, _scroll_connector_bar_size_changed_cb, ctx); |