dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elementary: make sure Efl.Ui.Multi_Selectable_Index_Range use unsigned int for index too. 

T8469

Reviewed-by: SangHyeon Jade Lee <sh10233.lee@samsung.com>
Differential Revision: https://phab.enlightenment.org/D10910
This commit is contained in:
Cedric BAIL 2019-12-18 11:34:00 -08:00
parent 46fef6901d
commit 0a399b3ca3
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/elementary/efl_ui_multi_selectable_index_range.eo
View File

@ -16,13 +16,13 @@ interface Efl.Ui.Multi_Selectable_Index_Range extends Efl.Ui.Multi_Selectable
selected_ndx_iterator_new { selected_ndx_iterator_new {
[[Gets an iterator over the indices of all the selected children. [[Gets an iterator over the indices of all the selected children.
]] ]]
return: iterator<uint64> @move @no_unused; [[The iterator gives the indices of the selected children. return: iterator<uint> @move @no_unused; [[The iterator gives the indices of the selected children.
It is valid until any change is made to the selection state.]] It is valid until any change is made to the selection state.]]
} }
unselected_ndx_iterator_new { unselected_ndx_iterator_new {
[[Gets an iterator over the indices of all the unselected children. [[Gets an iterator over the indices of all the unselected children.
]] ]]
return: iterator<uint64> @move @no_unused; [[The iterator gives the indices of the unselected children. return: iterator<uint> @move @no_unused; [[The iterator gives the indices of the unselected children.
It is valid until any change is made to the selection state.]] It is valid until any change is made to the selection state.]]
} }
ndx_range_select @beta { ndx_range_select @beta {
@ -34,8 +34,8 @@ interface Efl.Ui.Multi_Selectable_Index_Range extends Efl.Ui.Multi_Selectable
$NULL is not allowed as either of the parameters. $NULL is not allowed as either of the parameters.
]] ]]
params { params {
a : uint64; [[One side of the range.]] a : uint; [[One side of the range.]]
b : uint64; [[The other side of the range.]] b : uint; [[The other side of the range.]]
} }
} }
ndx_range_unselect @beta { ndx_range_unselect @beta {
@ -48,8 +48,8 @@ interface Efl.Ui.Multi_Selectable_Index_Range extends Efl.Ui.Multi_Selectable
Both of the passed values will also be unselected. Both of the passed values will also be unselected.
]] ]]
params { params {
a : uint64; [[One side of the range.]] a : uint; [[One side of the range.]]
b : uint64; [[The other side of the range.]] b : uint; [[The other side of the range.]]
} }
} }
} }

16
src/lib/elementary/efl_ui_select_model.c
View File

@ -536,7 +536,7 @@ static void
_efl_ui_select_model_efl_ui_multi_selectable_all_select(Eo *obj, _efl_ui_select_model_efl_ui_multi_selectable_all_select(Eo *obj,
Efl_Ui_Select_Model_Data *pd EINA_UNUSED) Efl_Ui_Select_Model_Data *pd EINA_UNUSED)
{ {
unsigned long count, i; unsigned int count, i;
// Not the fastest way to implement it, but will reuse more code and be easier as a v1. // Not the fastest way to implement it, but will reuse more code and be easier as a v1.
// It also make it not very async which could be noticable. // It also make it not very async which could be noticable.
@ -544,7 +544,7 @@ _efl_ui_select_model_efl_ui_multi_selectable_all_select(Eo *obj,
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
Eina_Value p = eina_value_ulong_init(i); Eina_Value p = eina_value_uint_init(i);
efl_model_property_set(obj, "child.selected", &p); efl_model_property_set(obj, "child.selected", &p);
@ -554,17 +554,17 @@ _efl_ui_select_model_efl_ui_multi_selectable_all_select(Eo *obj,
static void static void
_efl_ui_select_model_efl_ui_multi_selectable_all_unselect(Eo *obj, _efl_ui_select_model_efl_ui_multi_selectable_all_unselect(Eo *obj,
Efl_Ui_Select_Model_Data *pd EINA_UNUSED) Efl_Ui_Select_Model_Data *pd EINA_UNUSED)
{ {
uint64_t count = efl_model_children_count_get(obj); unsigned int count = efl_model_children_count_get(obj);
efl_ui_multi_selectable_ndx_range_unselect(obj, 0, count - 1); efl_ui_multi_selectable_ndx_range_unselect(obj, 0, count - 1);
} }
static void static void
_efl_ui_select_model_efl_ui_multi_selectable_index_range_ndx_range_select(Eo *obj, _efl_ui_select_model_efl_ui_multi_selectable_index_range_ndx_range_select(Eo *obj,
Efl_Ui_Select_Model_Data *pd EINA_UNUSED, Efl_Ui_Select_Model_Data *pd EINA_UNUSED,
uint64_t a, uint64_t b) unsigned int a, unsigned int b)
{ {
unsigned long count, i; unsigned long count, i;
@ -605,8 +605,8 @@ _children_unselect_then(Eo *o EINA_UNUSED, void *data EINA_UNUSED, const Eina_Va
static void static void
_efl_ui_select_model_efl_ui_multi_selectable_index_range_ndx_range_unselect(Eo *obj, _efl_ui_select_model_efl_ui_multi_selectable_index_range_ndx_range_unselect(Eo *obj,
Efl_Ui_Select_Model_Data *pd EINA_UNUSED, Efl_Ui_Select_Model_Data *pd EINA_UNUSED,
uint64_t a, uint64_t b) unsigned int a, unsigned int b)
{ {
unsigned int count, batch, i; unsigned int count, batch, i;