summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorHosang Kim <hosang12.kim@samsung.com>2019-09-16 11:50:12 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-09-16 12:04:27 +0200
commita6aa1b912e12ec8a78c7cef047d46d8123359812 (patch)
tree22dbff987b70acf009c406f3cb0b04df958c60a4 /src/tests
parent1d0a63695369da812b89a838ef21561211632bd9 (diff)
efl.ui.scrollable: fix event name for scrollable
Summary: Event name is applied in the past tense. Meaning of 'stop' is 'stop it early', so I changed it to 'finish' Test Plan: elementary_test -> efl.ui.scroller Reviewers: segfaultxavi, woohyun Reviewed By: segfaultxavi Subscribers: zmike, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9859
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/elementary/efl_ui_test_grid.c8
-rw-r--r--src/tests/elementary/efl_ui_test_scroller.c16
2 files changed, 12 insertions, 12 deletions
diff --git a/src/tests/elementary/efl_ui_test_grid.c b/src/tests/elementary/efl_ui_test_grid.c
index 9eaa096ad0..7ec1763545 100644
--- a/src/tests/elementary/efl_ui_test_grid.c
+++ b/src/tests/elementary/efl_ui_test_grid.c
@@ -257,13 +257,13 @@ grid_timer_cb(void *data EINA_UNUSED, const Efl_Event *event)
257} 257}
258 258
259static void 259static void
260grid_scroll_start_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 260grid_scroll_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
261{ 261{
262 //printf("LSH :: scroll start!!!\n"); 262 //printf("LSH :: scroll start!!!\n");
263} 263}
264 264
265static void 265static void
266grid_scroll_stop_cb(void *data, const Efl_Event *event EINA_UNUSED) 266grid_scroll_finished_cb(void *data, const Efl_Event *event EINA_UNUSED)
267{ 267{
268 Efl_Loop_Timer *timer = data; 268 Efl_Loop_Timer *timer = data;
269 efl_del(timer); 269 efl_del(timer);
@@ -271,8 +271,8 @@ grid_scroll_stop_cb(void *data, const Efl_Event *event EINA_UNUSED)
271} 271}
272 272
273EFL_CALLBACKS_ARRAY_DEFINE(grid_scroll_callbacks, 273EFL_CALLBACKS_ARRAY_DEFINE(grid_scroll_callbacks,
274 { EFL_UI_EVENT_SCROLL_START, grid_scroll_start_cb }, 274 { EFL_UI_EVENT_SCROLL_STARTED, grid_scroll_started_cb },
275 { EFL_UI_EVENT_SCROLL_STOP, grid_scroll_stop_cb }); 275 { EFL_UI_EVENT_SCROLL_FINISHED, grid_scroll_finished_cb });
276 276
277EFL_START_TEST(efl_ui_grid_scroll) 277EFL_START_TEST(efl_ui_grid_scroll)
278{ 278{
diff --git a/src/tests/elementary/efl_ui_test_scroller.c b/src/tests/elementary/efl_ui_test_scroller.c
index eeb9a84fd2..e1aa4ef53b 100644
--- a/src/tests/elementary/efl_ui_test_scroller.c
+++ b/src/tests/elementary/efl_ui_test_scroller.c
@@ -7,11 +7,11 @@
7#include "efl_ui_suite.h" 7#include "efl_ui_suite.h"
8 8
9static void 9static void
10_startstop_event_cb(void *data, const Efl_Event *ev EINA_UNUSED) 10_startfinish_event_cb(void *data, const Efl_Event *ev EINA_UNUSED)
11{ 11{
12 int *called = data; 12 int *called = data;
13 (*called)++; 13 (*called)++;
14 /* start/stop always come in pairs */ 14 /* start/finish always come in pairs */
15 if (*called == 2) ecore_main_loop_quit(); 15 if (*called == 2) ecore_main_loop_quit();
16} 16}
17 17
@@ -24,8 +24,8 @@ EFL_START_TEST(efl_ui_test_scroller_events)
24 24
25 25
26 sc = efl_add(EFL_UI_SCROLLER_CLASS, win, 26 sc = efl_add(EFL_UI_SCROLLER_CLASS, win,
27 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _startstop_event_cb, &called), 27 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _startfinish_event_cb, &called),
28 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _startstop_event_cb, &called), 28 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _startfinish_event_cb, &called),
29 efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(500, 500)) 29 efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(500, 500))
30 ); 30 );
31 31
@@ -52,8 +52,8 @@ EFL_START_TEST(efl_ui_test_scroller_events)
52 52
53 sc2 = efl_add(EFL_UI_SCROLLER_CLASS, bx, 53 sc2 = efl_add(EFL_UI_SCROLLER_CLASS, bx,
54 efl_ui_scrollable_match_content_set(efl_added, EINA_FALSE, EINA_TRUE), 54 efl_ui_scrollable_match_content_set(efl_added, EINA_FALSE, EINA_TRUE),
55 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _startstop_event_cb, &called2), 55 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _startfinish_event_cb, &called2),
56 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _startstop_event_cb, &called2), 56 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _startfinish_event_cb, &called2),
57 efl_pack(bx, efl_added)); 57 efl_pack(bx, efl_added));
58 58
59 bx2 = efl_add(EFL_UI_BOX_CLASS, sc2, 59 bx2 = efl_add(EFL_UI_BOX_CLASS, sc2,
@@ -91,8 +91,8 @@ EFL_START_TEST(efl_ui_test_scroller_events)
91 sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win, 91 sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win,
92 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 92 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
93 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 93 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
94 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _startstop_event_cb, &called3), 94 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STARTED, _startfinish_event_cb, &called3),
95 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _startstop_event_cb, &called3), 95 efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_FINISHED, _startfinish_event_cb, &called3),
96 efl_pack_table(gd, efl_added, 0, 0, 1, 1)); 96 efl_pack_table(gd, efl_added, 0, 0, 1, 1));
97 97
98 gd2 = efl_add(EFL_UI_TABLE_CLASS, sc3, 98 gd2 = efl_add(EFL_UI_TABLE_CLASS, sc3,