summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWoochan Lee <wc0917.lee@samsung.com>2017-12-11 16:30:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-12-11 16:45:27 +0900
commit4b2f1abc9f3c6a6ffda8584057f86d461bf42cd9 (patch)
treeb656fb2e2cf32333c5d4e6386f19985cf8e19307 /src
parentbb68d84e789636076fac5c856d7c49d4bd4afb01 (diff)
efl_ui_spin_button: Change property name to avoid name duplicating.
Summary: The name 'loop' is already there in efl canvas. loop -> circulate. Test Plan: elementary_test -> efl_ui_spin_button test. Reviewers: jpeg, Jaehyun_Cho, woohyun Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5639
Diffstat (limited to '')
-rw-r--r--src/bin/elementary/test_ui_spin_button.c2
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c10
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo8
-rw-r--r--src/lib/elementary/efl_ui_spin_button_private.h2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index e9730721e7..ddb93f302c 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -27,7 +27,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
27 efl_ui_range_min_max_set(efl_added, 0, 10), 27 efl_ui_range_min_max_set(efl_added, 0, 10),
28 efl_ui_range_value_set(efl_added, 6), 28 efl_ui_range_value_set(efl_added, 6),
29 efl_ui_range_step_set(efl_added, 2), 29 efl_ui_range_step_set(efl_added, 2),
30 efl_ui_spin_button_loop_set(efl_added, EINA_TRUE), 30 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
31 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 31 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
32 efl_event_callback_add(efl_added, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED,_spin_delay_changed_cb, NULL), 32 efl_event_callback_add(efl_added, EFL_UI_SPIN_BUTTON_EVENT_DELAY_CHANGED,_spin_delay_changed_cb, NULL),
33 efl_pack(bx, efl_added)); 33 efl_pack(bx, efl_added));
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index abc49eda93..d8d0f9ddb6 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -135,7 +135,7 @@ _value_set(Evas_Object *obj,
135 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS); 135 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS);
136 Efl_Ui_Spin_Data *pd = efl_data_scope_get(obj, EFL_UI_SPIN_CLASS); 136 Efl_Ui_Spin_Data *pd = efl_data_scope_get(obj, EFL_UI_SPIN_CLASS);
137 137
138 if (sd->loop) 138 if (sd->circulate)
139 { 139 {
140 if (new_val < pd->val_min) 140 if (new_val < pd->val_min)
141 new_val = pd->val_max; 141 new_val = pd->val_max;
@@ -820,15 +820,15 @@ _efl_ui_spin_button_editable_get(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *s
820} 820}
821 821
822EOLIAN static void 822EOLIAN static void
823_efl_ui_spin_button_loop_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool loop) 823_efl_ui_spin_button_circulate_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool circulate)
824{ 824{
825 sd->loop = loop; 825 sd->circulate = circulate;
826} 826}
827 827
828EOLIAN static Eina_Bool 828EOLIAN static Eina_Bool
829_efl_ui_spin_button_loop_get(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd) 829_efl_ui_spin_button_circulate_get(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd)
830{ 830{
831 return sd->loop; 831 return sd->circulate;
832} 832}
833 833
834EOLIAN static const Efl_Access_Action_Data * 834EOLIAN 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 e12841d838..ff89a2fa32 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -10,8 +10,8 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition,
10 @since 1.21 10 @since 1.21
11 ]] 11 ]]
12 methods { 12 methods {
13 @property loop { 13 @property circulate {
14 [[Control whether the spin should loop when it reaches its minimum or maximum value. 14 [[Control whether the spin should circulate value when it reaches its minimum or maximum value.
15 15
16 Disabled by default. If disabled, when the user tries to increment the 16 Disabled by default. If disabled, when the user tries to increment the
17 value, 17 value,
@@ -21,7 +21,7 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition,
21 but the value less step is less than minimum value. In this case, 21 but the value less step is less than minimum value. In this case,
22 the new displayed value will be the minimum value. 22 the new displayed value will be the minimum value.
23 23
24 When loop is enabled, when the user tries to increment the value, 24 When this is enabled, when the user tries to increment the value,
25 but displayed value plus step value is bigger than maximum value, 25 but displayed value plus step value is bigger than maximum value,
26 the new value will be the minimum value. When the the user tries to 26 the new value will be the minimum value. When the the user tries to
27 decrement it, but the value less step is less than minimum value, 27 decrement it, but the value less step is less than minimum value,
@@ -40,7 +40,7 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition,
40 get { 40 get {
41 } 41 }
42 values { 42 values {
43 loop: bool(false); [[$true to enable loop or $false to disable it.]] 43 circulate: bool(false); [[$true to enable circulate or $false to disable it.]]
44 } 44 }
45 } 45 }
46 @property editable { 46 @property editable {
diff --git a/src/lib/elementary/efl_ui_spin_button_private.h b/src/lib/elementary/efl_ui_spin_button_private.h
index 4b59f7c88a..217e9865be 100644
--- a/src/lib/elementary/efl_ui_spin_button_private.h
+++ b/src/lib/elementary/efl_ui_spin_button_private.h
@@ -14,7 +14,7 @@ struct _Efl_Ui_Spin_Button_Data
14 Eina_Bool entry_reactivate : 1; 14 Eina_Bool entry_reactivate : 1;
15 Eina_Bool editable : 1; 15 Eina_Bool editable : 1;
16 Eina_Bool inc_val : 1; 16 Eina_Bool inc_val : 1;
17 Eina_Bool loop : 1; 17 Eina_Bool circulate : 1;
18}; 18};
19 19
20#endif 20#endif