summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-31 18:06:43 +0200
committerCedric BAIL <cedric.bail@free.fr>2019-08-01 14:36:53 -0700
commitfd860eb6e80d3e54efc3e25a2861424c1fea6959 (patch)
treefa5feb74e1eb73e902ac05e3e179fcfc8b337382
parentbd8fcab8b203940d51f7b4d49636b80da9a41839 (diff)
efl_ui_spin_button: rename circulate to wraparound
ref T8097 Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D9461
-rw-r--r--src/bin/elementary/test_ui_spin_button.c2
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c6
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c10
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_spin_button_private.h2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c4
6 files changed, 13 insertions, 13 deletions
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index 2bfb7b2..e6b3135 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -41,7 +41,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
41 efl_ui_range_limits_set(efl_added, 0, 10), 41 efl_ui_range_limits_set(efl_added, 0, 10),
42 efl_ui_range_value_set(efl_added, 6), 42 efl_ui_range_value_set(efl_added, 6),
43 efl_ui_range_step_set(efl_added, 2), 43 efl_ui_range_step_set(efl_added, 2),
44 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 44 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
45 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 45 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
46 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_STEADY,_spin_delay_changed_cb, NULL), 46 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_STEADY,_spin_delay_changed_cb, NULL),
47 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _spin_changed_cb, NULL), 47 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _spin_changed_cb, NULL),
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 1aa472d..0a4a39b 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -161,21 +161,21 @@ _fields_init(Eo *obj)
161 //Field create. 161 //Field create.
162 pd->year = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 162 pd->year = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
163 efl_ui_range_limits_set(efl_added, 1900, 2037), 163 efl_ui_range_limits_set(efl_added, 1900, 2037),
164 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 164 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
165 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 165 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
166 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 166 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
167 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 167 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
168 168
169 pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 169 pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
170 efl_ui_range_limits_set(efl_added, 1, 12), 170 efl_ui_range_limits_set(efl_added, 1, 12),
171 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 171 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
172 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 172 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
173 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 173 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
174 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 174 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
175 175
176 pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 176 pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
177 efl_ui_range_limits_set(efl_added, 1, 31), 177 efl_ui_range_limits_set(efl_added, 1, 31),
178 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 178 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
179 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 179 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
180 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 180 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
181 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 181 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 553c363..cfd13cf 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -137,7 +137,7 @@ _value_set(Evas_Object *obj,
137 Efl_Ui_Spin_Data *pd = efl_data_scope_get(obj, EFL_UI_SPIN_CLASS); 137 Efl_Ui_Spin_Data *pd = efl_data_scope_get(obj, EFL_UI_SPIN_CLASS);
138 Eina_Future *f; 138 Eina_Future *f;
139 139
140 if (sd->circulate) 140 if (sd->wraparound)
141 { 141 {
142 if (new_val < pd->val_min) 142 if (new_val < pd->val_min)
143 new_val = pd->val_max; 143 new_val = pd->val_max;
@@ -732,15 +732,15 @@ _efl_ui_spin_button_editable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_D
732} 732}
733 733
734EOLIAN static void 734EOLIAN static void
735_efl_ui_spin_button_circulate_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool circulate) 735_efl_ui_spin_button_wraparound_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool wraparound)
736{ 736{
737 sd->circulate = circulate; 737 sd->wraparound = wraparound;
738} 738}
739 739
740EOLIAN static Eina_Bool 740EOLIAN static Eina_Bool
741_efl_ui_spin_button_circulate_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd) 741_efl_ui_spin_button_wraparound_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd)
742{ 742{
743 return sd->circulate; 743 return sd->wraparound;
744} 744}
745 745
746EOLIAN static const Efl_Access_Action_Data * 746EOLIAN static const Efl_Access_Action_Data *
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index 2affb77..a4ec1c6 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -8,7 +8,7 @@ class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Compo
8 over them and inputting new ones. 8 over them and inputting new ones.
9 ]] 9 ]]
10 methods { 10 methods {
11 @property circulate { 11 @property wraparound {
12 [[Control whether the spin should circulate value when it reaches its minimum or maximum value. 12 [[Control whether the spin should circulate value when it reaches its minimum or maximum value.
13 13
14 Disabled by default. If disabled, when the user tries to increment the 14 Disabled by default. If disabled, when the user tries to increment the
diff --git a/src/lib/elementary/efl_ui_spin_button_private.h b/src/lib/elementary/efl_ui_spin_button_private.h
index 5c6d0a9..daab1ad 100644
--- a/src/lib/elementary/efl_ui_spin_button_private.h
+++ b/src/lib/elementary/efl_ui_spin_button_private.h
@@ -12,7 +12,7 @@ struct _Efl_Ui_Spin_Button_Data
12 Eina_Bool entry_visible : 1; 12 Eina_Bool entry_visible : 1;
13 Eina_Bool entry_reactivate : 1; 13 Eina_Bool entry_reactivate : 1;
14 Eina_Bool editable : 1; 14 Eina_Bool editable : 1;
15 Eina_Bool circulate : 1; 15 Eina_Bool wraparound : 1;
16}; 16};
17 17
18#endif 18#endif
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 4e02665..a1ca671 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -123,14 +123,14 @@ _fields_init(Eo *obj)
123 //Field create. 123 //Field create.
124 pd->hour = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 124 pd->hour = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
125 efl_ui_range_limits_set(efl_added, 1, 12), 125 efl_ui_range_limits_set(efl_added, 1, 12),
126 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 126 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
127 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 127 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
128 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 128 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
129 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 129 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
130 130
131 pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 131 pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
132 efl_ui_range_limits_set(efl_added, 0, 59), 132 efl_ui_range_limits_set(efl_added, 0, 59),
133 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 133 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
134 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 134 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
135 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 135 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
136 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 136 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));