enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

efl_ui_range_display: move events from spin 

we concluded min,reached and max,reached should be on every widget that
implements range_display. This here is the start of that work, the
events are moved, next commit fixes all widgets, the last commits
enables tests in the spec unit test.

ref T7897
ref T7895

Differential Revision: https://phab.enlightenment.org/D9371
This commit is contained in:
Marcel Hollerbach 2019-07-22 12:27:20 +02:00 committed by Xavi Artigas
parent 911eab3420
commit c0082b1c71
28 changed files with 83 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/elementary/test_evas_snapshot.c
View File

@ -173,7 +173,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
elm_slider_unit_format_set(efl_added, "%.0f px"), elm_slider_unit_format_set(efl_added, "%.0f px"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack_table(table, efl_added, 0, TABLE_SIZE, TABLE_SIZE, 1), efl_pack_table(table, efl_added, 0, TABLE_SIZE, TABLE_SIZE, 1),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win)); efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _radius_set, win));
box = efl_add(EFL_UI_BOX_CLASS, win, box = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),

14
src/bin/elementary/test_ui_box.c
View File

@ -379,7 +379,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, user_min_slider_cb, NULL);
elm_slider_min_max_set(o, 0, 250); elm_slider_min_max_set(o, 0, 250);
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0); elm_slider_value_set(o, 0);
@ -406,7 +406,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, win); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, padding_slider_cb, win);
elm_slider_min_max_set(o, 0, 40); elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10); elm_slider_value_set(o, 10);
@ -433,7 +433,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, win); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, margin_slider_cb, win);
elm_slider_min_max_set(o, 0, 40); elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10); elm_slider_value_set(o, 10);
@ -460,7 +460,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, win); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, alignv_slider_cb, win);
elm_slider_min_max_set(o, -0.1, 1.0); elm_slider_min_max_set(o, -0.1, 1.0);
elm_slider_step_set(o, 0.1); elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5); elm_slider_value_set(o, 0.5);
@ -474,7 +474,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 0); efl_gfx_hint_weight_set(o, 1, 0);
efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0)); efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0));
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, win); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, alignh_slider_cb, win);
elm_slider_min_max_set(o, -0.1, 1.0); elm_slider_min_max_set(o, -0.1, 1.0);
elm_slider_step_set(o, 0.1); elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5); elm_slider_value_set(o, 0.5);
@ -500,7 +500,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_btn_slider_cb, win); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, alignv_btn_slider_cb, win);
elm_slider_min_max_set(o, 0.0, 1.0); elm_slider_min_max_set(o, 0.0, 1.0);
elm_slider_step_set(o, 0.1); elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5); elm_slider_value_set(o, 0.5);
@ -514,7 +514,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 0); efl_gfx_hint_weight_set(o, 1, 0);
efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0)); efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0));
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_btn_slider_cb, win); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, alignh_btn_slider_cb, win);
elm_slider_min_max_set(o, -0.1, 1.0); elm_slider_min_max_set(o, -0.1, 1.0);
elm_slider_step_set(o, 0.1); elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5); elm_slider_value_set(o, 0.5);

4
src/bin/elementary/test_ui_pager.c
View File

@ -364,7 +364,7 @@ static void page_size_cb(void *data,
efl_ui_range_limits_set(efl_added, 100, 200), efl_ui_range_limits_set(efl_added, 100, 200),
efl_ui_range_value_set(efl_added, params->w), efl_ui_range_value_set(efl_added, params->w),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
width_slider_cb, params), width_slider_cb, params),
efl_pack_end(inbox, efl_added)); efl_pack_end(inbox, efl_added));
@ -405,7 +405,7 @@ static void page_size_cb(void *data,
efl_ui_range_limits_set(efl_added, 100, 300), efl_ui_range_limits_set(efl_added, 100, 300),
efl_ui_range_value_set(efl_added, params->h), efl_ui_range_value_set(efl_added, params->h),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
height_slider_cb, params), height_slider_cb, params),
efl_pack_end(inbox, efl_added)); efl_pack_end(inbox, efl_added));

8
src/bin/elementary/test_ui_pager_scroll.c
View File

@ -418,7 +418,7 @@ static void page_size_cb(void *data,
efl_ui_range_limits_set(efl_added, 100, 200), efl_ui_range_limits_set(efl_added, 100, 200),
efl_ui_range_value_set(efl_added, params->w), efl_ui_range_value_set(efl_added, params->w),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
width_slider_cb, params), width_slider_cb, params),
efl_pack_end(inbox, efl_added)); efl_pack_end(inbox, efl_added));
@ -459,7 +459,7 @@ static void page_size_cb(void *data,
efl_ui_range_limits_set(efl_added, 100, 300), efl_ui_range_limits_set(efl_added, 100, 300),
efl_ui_range_value_set(efl_added, params->h), efl_ui_range_value_set(efl_added, params->h),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
height_slider_cb, params), height_slider_cb, params),
efl_pack_end(inbox, efl_added)); efl_pack_end(inbox, efl_added));
@ -503,7 +503,7 @@ static void padding_cb(void *data,
efl_ui_range_limits_set(efl_added, 0, 50), efl_ui_range_limits_set(efl_added, 0, 50),
efl_ui_range_value_set(efl_added, params->padding), efl_ui_range_value_set(efl_added, params->padding),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
padding_slider_cb, params), padding_slider_cb, params),
efl_pack_end(box, efl_added)); efl_pack_end(box, efl_added));
} }
@ -534,7 +534,7 @@ static void side_page_num_cb(void *data,
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
efl_gfx_hint_weight_set(efl_added, 1, 1), efl_gfx_hint_weight_set(efl_added, 1, 1),
efl_gfx_hint_align_set(efl_added, -1, -1), efl_gfx_hint_align_set(efl_added, -1, -1),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
side_page_num_slider_cb, params), side_page_num_slider_cb, params),
efl_pack_end(box, efl_added)); efl_pack_end(box, efl_added));
} }

6
src/bin/elementary/test_ui_relative_layout.c
View File

@ -175,7 +175,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
efl_ui_range_step_set(efl_added, 0.1), efl_ui_range_step_set(efl_added, 0.1),
efl_ui_range_value_set(efl_added, relative), efl_ui_range_value_set(efl_added, relative),
efl_key_wref_set(efl_added, "btn", btn), efl_key_wref_set(efl_added, "btn", btn),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_relative_cb, (void *)option), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _slider_changed_relative_cb, (void *)option),
efl_pack(hbox, efl_added)); efl_pack(hbox, efl_added));
} }
@ -246,7 +246,7 @@ _button_frame_add(Eo *box, Eo *btn)
efl_ui_range_step_set(efl_added, 0.1), efl_ui_range_step_set(efl_added, 0.1),
efl_ui_range_value_set(efl_added, align_x), efl_ui_range_value_set(efl_added, align_x),
efl_key_wref_set(efl_added, "btn", btn), efl_key_wref_set(efl_added, "btn", btn),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_align_cb, (void *)'x'), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _slider_changed_align_cb, (void *)'x'),
efl_pack(hbox, efl_added)); efl_pack(hbox, efl_added));
hbox = efl_add(EFL_UI_BOX_CLASS, vbox, hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
@ -266,7 +266,7 @@ _button_frame_add(Eo *box, Eo *btn)
efl_ui_range_step_set(efl_added, 0.1), efl_ui_range_step_set(efl_added, 0.1),
efl_ui_range_value_set(efl_added, align_y), efl_ui_range_value_set(efl_added, align_y),
efl_key_wref_set(efl_added, "btn", btn), efl_key_wref_set(efl_added, "btn", btn),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_align_cb, (void *)'y'), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _slider_changed_align_cb, (void *)'y'),
efl_pack(hbox, efl_added)); efl_pack(hbox, efl_added));
} }

2
src/bin/elementary/test_ui_slider.c
View File

@ -115,6 +115,6 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)),
efl_ui_range_limits_set(efl_added, 0, 150), efl_ui_range_limits_set(efl_added, 0, 150),
efl_ui_range_step_set(efl_added, 9), efl_ui_range_step_set(efl_added, 9),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _slider_changed_cb, NULL),
efl_pack(bx, efl_added)); efl_pack(bx, efl_added));
} }

2
src/bin/elementary/test_ui_slider_interval.c
View File

@ -112,6 +112,6 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_range_limits_set(efl_added, 0, 600), efl_ui_range_limits_set(efl_added, 0, 600),
efl_ui_slider_interval_value_set(efl_added, 100, 500), efl_ui_slider_interval_value_set(efl_added, 100, 500),
efl_ui_range_step_set(efl_added, step), efl_ui_range_step_set(efl_added, step),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _intv_slider_changed_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _intv_slider_changed_cb, NULL),
efl_pack(bx, efl_added)); efl_pack(bx, efl_added));
} }

6
src/bin/elementary/test_ui_spin.c
View File

@ -51,9 +51,9 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_ui_range_value_set(efl_added, 6), efl_ui_range_value_set(efl_added, 6),
efl_ui_range_step_set(efl_added, 2), efl_ui_range_step_set(efl_added, 2),
efl_ui_format_string_set(efl_added, "test %d", EFL_UI_FORMAT_STRING_TYPE_SIMPLE), efl_ui_format_string_set(efl_added, "test %d", EFL_UI_FORMAT_STRING_TYPE_SIMPLE),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_spin_changed_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_spin_changed_cb, NULL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_MIN_REACHED,_spin_min_reached_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_MIN_REACHED,_spin_min_reached_cb, NULL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_MAX_REACHED,_spin_max_reached_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_MAX_REACHED,_spin_max_reached_cb, NULL),
efl_pack(bx, efl_added)); efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, bx, efl_add(EFL_UI_BUTTON_CLASS, bx,

2
src/bin/elementary/test_ui_spin_button.c
View File

@ -44,7 +44,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED,_spin_delay_changed_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED,_spin_delay_changed_cb, NULL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED, _spin_changed_cb, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _spin_changed_cb, NULL),
efl_pack(bx, efl_added)); efl_pack(bx, efl_added));
efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx, efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx,

4
src/bin/elementary/test_ui_spotlight.c
View File

@ -397,7 +397,7 @@ spotlight_size(void *data,
efl_ui_range_limits_set(efl_added, 100, 200), efl_ui_range_limits_set(efl_added, 100, 200),
efl_ui_range_value_set(efl_added, params->w), efl_ui_range_value_set(efl_added, params->w),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
width_slider_cb, params), width_slider_cb, params),
efl_pack_end(inbox, efl_added)); efl_pack_end(inbox, efl_added));
@ -438,7 +438,7 @@ spotlight_size(void *data,
efl_ui_range_limits_set(efl_added, 100, 300), efl_ui_range_limits_set(efl_added, 100, 300),
efl_ui_range_value_set(efl_added, params->h), efl_ui_range_value_set(efl_added, params->h),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,
height_slider_cb, params), height_slider_cb, params),
efl_pack_end(inbox, efl_added)); efl_pack_end(inbox, efl_added));

12
src/bin/elementary/test_ui_table.c
View File

@ -304,7 +304,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, user_min_slider_cb, NULL);
elm_slider_min_max_set(o, 0, 250); elm_slider_min_max_set(o, 0, 250);
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0); elm_slider_value_set(o, 0);
@ -331,7 +331,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, table); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, padding_slider_cb, table);
elm_slider_min_max_set(o, 0, 40); elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0); elm_slider_value_set(o, 0);
@ -357,7 +357,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, table); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, margin_slider_cb, table);
elm_slider_min_max_set(o, 0, 40); elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0); elm_slider_value_set(o, 0);
@ -384,7 +384,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, table); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, btnmargins_slider_cb, table);
elm_slider_min_max_set(o, 0, 40); elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1); elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0); elm_slider_value_set(o, 0);
@ -411,7 +411,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_horizontal_set(o, 0); elm_slider_horizontal_set(o, 0);
efl_gfx_hint_align_set(o, 0.5, -1); efl_gfx_hint_align_set(o, 0.5, -1);
efl_gfx_hint_weight_set(o, 1, 1); efl_gfx_hint_weight_set(o, 1, 1);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, NULL); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, alignv_slider_cb, NULL);
elm_slider_min_max_set(o, 0, 1); elm_slider_min_max_set(o, 0, 1);
elm_slider_value_set(o, 0.3); elm_slider_value_set(o, 0.3);
efl_pack(bx, o); efl_pack(bx, o);
@ -423,7 +423,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_horizontal_set(o, 1); elm_slider_horizontal_set(o, 1);
efl_gfx_hint_align_set(o, -1, -1); efl_gfx_hint_align_set(o, -1, -1);
efl_gfx_hint_weight_set(o, 1, 0); efl_gfx_hint_weight_set(o, 1, 0);
efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, NULL); efl_event_callback_add(o, EFL_UI_RANGE_EVENT_CHANGED, alignh_slider_cb, NULL);
elm_slider_min_max_set(o, 0, 1); elm_slider_min_max_set(o, 0, 1);
elm_slider_value_set(o, 0.3); elm_slider_value_set(o, 0.3);
efl_pack(bx, o); efl_pack(bx, o);

4
src/bin/elementary/test_ui_textpath.c
View File

@ -152,7 +152,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL); efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL);
efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0)); efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0));
efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath); efl_event_callback_add(sld, EFL_UI_RANGE_EVENT_CHANGED, _angle_changed_cb, txtpath);
elm_box_pack_end(hbox, sld); elm_box_pack_end(hbox, sld);
efl_gfx_entity_visible_set(sld, EINA_TRUE); efl_gfx_entity_visible_set(sld, EINA_TRUE);
angle_sld = sld; angle_sld = sld;
@ -164,7 +164,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL); efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL);
efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0)); efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0));
efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath); efl_event_callback_add(sld, EFL_UI_RANGE_EVENT_CHANGED, _slice_no_changed_cb, txtpath);
elm_box_pack_end(hbox, sld); elm_box_pack_end(hbox, sld);
efl_gfx_entity_visible_set(sld, EINA_TRUE); efl_gfx_entity_visible_set(sld, EINA_TRUE);
slice_sld = sld; slice_sld = sld;

5
src/lib/efl/interfaces/efl_ui_range_display.eo
View File

@ -48,4 +48,9 @@ interface @beta Efl.Ui.Range_Display
} }
} }
} }
events {
changed: void; [[Emitted when the $range_value is getting changed]]
min,reached: void; [[Emitted when the $range_value has reached the minimum of $range_limits]]
max,reached: void; [[Emitted when the $range_value has reached the maximum of $range_limits]]
}
} }

6
src/lib/elementary/efl_ui_datepicker.c
View File

@ -164,21 +164,21 @@ _fields_init(Eo *obj)
efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
efl_ui_range_limits_set(efl_added, 1, 12), efl_ui_range_limits_set(efl_added, 1, 12),
efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
efl_ui_range_limits_set(efl_added, 1, 31), efl_ui_range_limits_set(efl_added, 1, 31),
efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
DATE_GET(); DATE_GET();
//Using system config? //Using system config?

2
src/lib/elementary/efl_ui_progressbar.c
View File

@ -559,7 +559,7 @@ _progressbar_part_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *pa
_val_set(obj); _val_set(obj);
_units_set(obj); _units_set(obj);
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_PROGRESSBAR_EVENT_CHANGED, NULL); (obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
} }
static double static double

3
src/lib/elementary/efl_ui_progressbar.eo
View File

@ -67,7 +67,4 @@ class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Rang
Efl.Content.content_unset; Efl.Content.content_unset;
Efl.Ui.L10n.l10n_text { get; set; } Efl.Ui.L10n.l10n_text { get; set; }
} }
events {
changed: void; [[Called when progressbar changed]]
}
} }

4
src/lib/elementary/efl_ui_slider.c
View File

@ -76,8 +76,8 @@ _efl_ui_slider_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Eina_Bool us
sd->val = val; sd->val = val;
if (user_event) if (user_event)
{ {
efl_event_callback_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_legacy_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
ecore_timer_del(sd->delay); ecore_timer_del(sd->delay);
sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
} }

3
src/lib/elementary/efl_ui_slider.eo
View File

@ -20,11 +20,10 @@ class @beta Efl.Ui.Slider extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Int
Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.Widget.Action.elm_actions { get; }
} }
events { events {
changed: void; [[Called when the slider position has changed.]]
steady: void; [[Called when the slider position has changed and has remained unchanged for 0.2s. steady: void; [[Called when the slider position has changed and has remained unchanged for 0.2s.
This allows filtering out unwanted "noise" from the slider signal if you are only This allows filtering out unwanted "noise" from the slider signal if you are only
interested in the final position of the slider. interested in the final position of the slider.
Use this signal instead of @[Efl.Ui.Slider.changed] if you are going to perform a costly operation Use this signal instead of @[Efl.Ui.Range_Display.changed] if you are going to perform a costly operation
on its handler.]] on its handler.]]
slider,drag,start: void; [[Called when a slider drag operation has started. This means a $press event slider,drag,start: void; [[Called when a slider drag operation has started. This means a $press event
has been received on the slider thumb but not the $unpress.]] has been received on the slider thumb but not the $unpress.]]

8
src/lib/elementary/efl_ui_slider_interval.c
View File

@ -77,8 +77,8 @@ _efl_ui_slider_interval_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
pd->intvl_from = val; pd->intvl_from = val;
if (user_event) if (user_event)
{ {
efl_event_callback_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_legacy_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
ecore_timer_del(pd->delay); ecore_timer_del(pd->delay);
pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
} }
@ -89,8 +89,8 @@ _efl_ui_slider_interval_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
pd->intvl_to = val2; pd->intvl_to = val2;
if (user_event) if (user_event)
{ {
efl_event_callback_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_legacy_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
ecore_timer_del(pd->delay); ecore_timer_del(pd->delay);
pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
} }

6
src/lib/elementary/efl_ui_spin.c
View File

@ -156,11 +156,11 @@ _efl_ui_spin_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Spin_Data *sd,
sd->val = val; sd->val = val;
if (EINA_DBL_EQ(sd->val, sd->val_min)) if (EINA_DBL_EQ(sd->val, sd->val_min))
efl_event_callback_call(obj, EFL_UI_SPIN_EVENT_MIN_REACHED, NULL); efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_MIN_REACHED, NULL);
else if (EINA_DBL_EQ(sd->val, sd->val_max)) else if (EINA_DBL_EQ(sd->val, sd->val_max))
efl_event_callback_call(obj, EFL_UI_SPIN_EVENT_MAX_REACHED, NULL); efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_MAX_REACHED, NULL);
efl_event_callback_call(obj, EFL_UI_SPIN_EVENT_CHANGED, NULL); efl_event_callback_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
_label_write(obj, sd); _label_write(obj, sd);
} }

5
src/lib/elementary/efl_ui_spin.eo
View File

@ -15,9 +15,4 @@ class @beta Efl.Ui.Spin extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Inter
Efl.Ui.Range_Display.range_value { get; set; } Efl.Ui.Range_Display.range_value { get; set; }
Efl.Ui.Format.apply_formatted_value; Efl.Ui.Format.apply_formatted_value;
} }
events {
changed: void; [[Called when spin changed]]
min,reached: void; [[Called when spin value reached min]]
max,reached: void; [[Called when spin value reached max]]
}
} }

4
src/lib/elementary/efl_ui_timepicker.c
View File

@ -126,14 +126,14 @@ _fields_init(Eo *obj)
efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
efl_ui_range_limits_set(efl_added, 0, 59), efl_ui_range_limits_set(efl_added, 0, 59),
efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
pd->ampm = efl_add(EFL_UI_BUTTON_CLASS, obj, pd->ampm = efl_add(EFL_UI_BUTTON_CLASS, obj,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _field_changed_cb, obj), efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _field_changed_cb, obj),

4
src/lib/elementary/elc_player.c
View File

@ -88,7 +88,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(_emotion_cb,
); );
EFL_CALLBACKS_ARRAY_DEFINE(_slider_cb, EFL_CALLBACKS_ARRAY_DEFINE(_slider_cb,
{ EFL_UI_SLIDER_EVENT_CHANGED, _update_position }, { EFL_UI_RANGE_EVENT_CHANGED, _update_position },
{ EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, _drag_start }, { EFL_UI_SLIDER_EVENT_SLIDER_DRAG_START, _drag_start },
{ EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, _drag_stop } { EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, _drag_stop }
); );
@ -630,7 +630,7 @@ _elm_player_efl_canvas_group_group_add(Eo *obj, Elm_Player_Data *priv)
elm_layout_content_set(obj, "elm.swallow.media_player.volumeslider", elm_layout_content_set(obj, "elm.swallow.media_player.volumeslider",
priv->vslider); priv->vslider);
efl_event_callback_add efl_event_callback_add
(priv->vslider, EFL_UI_SLIDER_EVENT_CHANGED, _update_volume, obj); (priv->vslider, EFL_UI_RANGE_EVENT_CHANGED, _update_volume, obj);
elm_layout_sizing_eval(obj); elm_layout_sizing_eval(obj);
elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_can_focus_set(obj, EINA_TRUE);

4
src/lib/elementary/elm_slider.c
View File

@ -603,7 +603,7 @@ _elm_slider_val_fetch(Evas_Object *obj, Elm_Slider_Data *pd, Eina_Bool user_even
id->intvl_from = val; id->intvl_from = val;
if (user_event) if (user_event)
{ {
efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_legacy_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
ecore_timer_del(pd->delay); ecore_timer_del(pd->delay);
pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
evented = EINA_TRUE; evented = EINA_TRUE;
@ -616,7 +616,7 @@ _elm_slider_val_fetch(Evas_Object *obj, Elm_Slider_Data *pd, Eina_Bool user_even
/* avoid emitting two events and setting a timer twice */ /* avoid emitting two events and setting a timer twice */
if (user_event && (!evented)) if (user_event && (!evented))
{ {
efl_event_callback_legacy_call(obj, EFL_UI_SLIDER_EVENT_CHANGED, NULL); efl_event_callback_legacy_call(obj, EFL_UI_RANGE_EVENT_CHANGED, NULL);
ecore_timer_del(pd->delay); ecore_timer_del(pd->delay);
pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); pd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
} }

2
src/modules/elementary/prefs/elm_slider.c
View File

@ -27,7 +27,7 @@ elm_prefs_slider_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
evas_object_data_set(obj, "prefs_type", (void *)type); evas_object_data_set(obj, "prefs_type", (void *)type);
efl_event_callback_add efl_event_callback_add
(obj, EFL_UI_SLIDER_EVENT_CHANGED, _item_changed_cb, cb); (obj, EFL_UI_RANGE_EVENT_CHANGED, _item_changed_cb, cb);
if (type == ELM_PREFS_TYPE_INT) if (type == ELM_PREFS_TYPE_INT)
{ {
elm_slider_unit_format_set(obj, "%1.0f"); elm_slider_unit_format_set(obj, "%1.0f");

6
src/tests/elementary/efl_ui_test_slider.c
View File

@ -13,7 +13,7 @@ slider_changed(void *data EINA_UNUSED, const Efl_Event *ev)
{ {
event_counter++; event_counter++;
if (event_counter == 1) if (event_counter == 1)
efl_event_callback_del(ev->object, EFL_UI_SLIDER_EVENT_CHANGED, slider_changed, NULL); efl_event_callback_del(ev->object, EFL_UI_RANGE_EVENT_CHANGED, slider_changed, NULL);
else if (event_counter == 2) else if (event_counter == 2)
ecore_main_loop_quit(); ecore_main_loop_quit();
} }
@ -26,7 +26,7 @@ EFL_START_TEST(efl_ui_test_slider_events)
efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 100)); efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 100));
slider = efl_add(EFL_UI_SLIDER_CLASS, win, slider = efl_add(EFL_UI_SLIDER_CLASS, win,
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, slider_changed, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, slider_changed, NULL),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_STEADY, slider_changed, NULL), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_STEADY, slider_changed, NULL),
efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(400, 100)) efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(400, 100))
); );
@ -60,7 +60,7 @@ EFL_START_TEST(efl_ui_test_slider_step)
efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 100)); efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 100));
slider = efl_add(EFL_UI_SLIDER_CLASS, win, slider = efl_add(EFL_UI_SLIDER_CLASS, win,
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, slider_changed, NULL), efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, slider_changed, NULL),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_STEADY, slider_changed, NULL), efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_STEADY, slider_changed, NULL),
efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(400, 100)) efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(400, 100))
); );

12
src/tests/elementary/efl_ui_test_spin.c
View File

@ -33,9 +33,9 @@ EFL_START_TEST (spin_value_events)
efl_ui_range_limits_set(spin, -3.0, 3.0); efl_ui_range_limits_set(spin, -3.0, 3.0);
efl_ui_range_value_set(spin, 0.0); efl_ui_range_value_set(spin, 0.0);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_CHANGED, _set_flag, &changed); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MIN_REACHED, _set_flag, &min_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MAX_REACHED, _set_flag, &max_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached);
efl_ui_range_value_set(spin, 1.0); efl_ui_range_value_set(spin, 1.0);
ck_assert_int_eq(changed, EINA_TRUE); ck_assert_int_eq(changed, EINA_TRUE);
@ -67,9 +67,9 @@ EFL_START_TEST (spin_wheel_test)
efl_ui_range_limits_set(spin, -100.0, 100.0); efl_ui_range_limits_set(spin, -100.0, 100.0);
efl_ui_range_value_set(spin, 0.0); efl_ui_range_value_set(spin, 0.0);
efl_ui_range_step_set(spin, 10.0); efl_ui_range_step_set(spin, 10.0);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_CHANGED, _set_flag, &changed); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MIN_REACHED, _set_flag, &min_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MAX_REACHED, _set_flag, &max_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached);
efl_gfx_entity_size_set(win, EINA_SIZE2D(60, 60)); efl_gfx_entity_size_set(win, EINA_SIZE2D(60, 60));
get_me_to_those_events(spin); get_me_to_those_events(spin);

30
src/tests/elementary/efl_ui_test_spin_button.c
View File

@ -52,9 +52,9 @@ EFL_START_TEST (spin_value_events)
efl_ui_range_limits_set(spin, -3.0, 3.0); efl_ui_range_limits_set(spin, -3.0, 3.0);
efl_ui_range_value_set(spin, 0.0); efl_ui_range_value_set(spin, 0.0);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_CHANGED, _set_flag, &changed); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MIN_REACHED, _set_flag, &min_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MAX_REACHED, _set_flag, &max_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached);
efl_ui_range_value_set(spin, 1.0); efl_ui_range_value_set(spin, 1.0);
ck_assert_int_eq(changed, EINA_TRUE); ck_assert_int_eq(changed, EINA_TRUE);
@ -89,9 +89,9 @@ EFL_START_TEST (spin_wheel_test)
efl_ui_range_limits_set(spin, -100.0, 100.0); efl_ui_range_limits_set(spin, -100.0, 100.0);
efl_ui_range_value_set(spin, 0.0); efl_ui_range_value_set(spin, 0.0);
efl_ui_range_step_set(spin, 10.0); efl_ui_range_step_set(spin, 10.0);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_CHANGED, _set_flag, &changed); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MIN_REACHED, _set_flag, &min_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MAX_REACHED, _set_flag, &max_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached);
efl_gfx_entity_size_set(win, EINA_SIZE2D(60, 60)); efl_gfx_entity_size_set(win, EINA_SIZE2D(60, 60));
get_me_to_those_events(spin); get_me_to_those_events(spin);
@ -122,9 +122,9 @@ EFL_START_TEST (spin_value_inc)
efl_ui_range_limits_set(spin, 0.0, 3.0); efl_ui_range_limits_set(spin, 0.0, 3.0);
efl_ui_range_value_set(spin, 1.0); efl_ui_range_value_set(spin, 1.0);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_CHANGED, _set_flag, &changed); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MIN_REACHED, _set_flag, &min_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MAX_REACHED, _set_flag, &max_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED, _set_flag_quit, &delay_changed); efl_event_callback_add(spin, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED, _set_flag_quit, &delay_changed);
click_spin_part(spin, "efl.inc_button"); click_spin_part(spin, "efl.inc_button");
@ -147,9 +147,9 @@ EFL_START_TEST (spin_value_inc_max)
efl_ui_range_limits_set(spin, 0.0, 3.0); efl_ui_range_limits_set(spin, 0.0, 3.0);
efl_ui_range_value_set(spin, 2.0); efl_ui_range_value_set(spin, 2.0);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_CHANGED, _set_flag, &changed); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MIN_REACHED, _set_flag, &min_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MAX_REACHED, _set_flag, &max_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED, _set_flag_quit, &delay_changed); efl_event_callback_add(spin, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED, _set_flag_quit, &delay_changed);
click_spin_part(spin, "efl.inc_button"); click_spin_part(spin, "efl.inc_button");
@ -172,9 +172,9 @@ EFL_START_TEST (spin_value_dec_min)
efl_ui_range_limits_set(spin, 0.0, 3.0); efl_ui_range_limits_set(spin, 0.0, 3.0);
efl_ui_range_value_set(spin, 1.0); efl_ui_range_value_set(spin, 1.0);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_CHANGED, _set_flag, &changed); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_CHANGED, _set_flag, &changed);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MIN_REACHED, _set_flag, &min_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MIN_REACHED, _set_flag, &min_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_EVENT_MAX_REACHED, _set_flag, &max_reached); efl_event_callback_add(spin, EFL_UI_RANGE_EVENT_MAX_REACHED, _set_flag, &max_reached);
efl_event_callback_add(spin, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED, _set_flag_quit, &delay_changed); efl_event_callback_add(spin, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED, _set_flag_quit, &delay_changed);
click_spin_part(spin, "efl.dec_button"); click_spin_part(spin, "efl.dec_button");