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

elm scroller - fix mapping of block enums - was broken

This commit is contained in:
Carsten Haitzler 2020-08-25 10:40:47 +01:00
parent ea1d4ecfdb
commit c565403bda
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,7 +540,7 @@ _dnd_drop_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{
Eina_Future *future;
future = efl_ui_dnd_drop_data_get(ev->object, evas_device_seat_id_get(evas_default_device_get(evas_object_evas_get(ev->object), EFL_INPUT_DEVICE_TYPE_SEAT)), eina_array_iterator_new(types));
future = efl_ui_dnd_drop_data_get(ev->object, evas_device_seat_id_get(evas_default_device_get(evas_object_evas_get(ev->object), EVAS_DEVICE_CLASS_SEAT)), eina_array_iterator_new(types));
efl_future_then(ev->object, future, _selection_data_cb);
}
@ -860,7 +860,7 @@ _selection_store(Efl_Ui_Cnp_Buffer buffer,
content = eina_content_new((Eina_Slice)EINA_SLICE_STR_FULL(sel), "application/x-elementary-markup");
efl_ui_selection_set(obj, buffer, content, evas_device_seat_id_get(evas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT)));
efl_ui_selection_set(obj, buffer, content, evas_device_seat_id_get(evas_default_device_get(evas_object_evas_get(obj), EVAS_DEVICE_CLASS_SEAT)));
free(sel);
}
@ -1981,7 +1981,7 @@ _efl_ui_textbox_selection_paste_type(Eo *obj, Efl_Ui_Textbox_Data *sd, Efl_Ui_Cn
Eina_Future *future;
Eina_Array *types = _figure_out_types(obj, sd);
future = efl_ui_selection_get(obj, type, evas_device_seat_id_get(evas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT)), eina_array_iterator_new(types));
future = efl_ui_selection_get(obj, type, evas_device_seat_id_get(evas_default_device_get(evas_object_evas_get(obj), EVAS_DEVICE_CLASS_SEAT)), eina_array_iterator_new(types));
efl_future_then(obj, future, _selection_data_cb);

2
src/lib/elementary/elm_interface_scrollable.h
View File

@ -74,7 +74,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
Elm_Scroller_Policy hbar_flags, vbar_flags;
Elm_Scroller_Single_Direction one_direction_at_a_time;
Elm_Scroller_Movement_Block block;
Efl_Ui_Layout_Orientation block;
struct
{

20
src/lib/elementary/elm_scroller.c
View File

@ -1214,10 +1214,10 @@ elm_scroller_movement_block_set(Evas_Object *obj,
Efl_Ui_Layout_Orientation mode = EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
// legacy -> eo
if (block == ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL)
mode = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
else if (block == ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL)
mode = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
if (block & ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL)
mode |= EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
if (block & ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL)
mode |= EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
elm_interface_scrollable_movement_block_set(obj, mode);
}
@ -1226,18 +1226,20 @@ EAPI Elm_Scroller_Movement_Block
elm_scroller_movement_block_get(const Evas_Object *obj)
{
Efl_Ui_Layout_Orientation mode;
Elm_Scroller_Movement_Block mode2 = 0;
ELM_SCROLLABLE_CHECK(obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
mode = elm_interface_scrollable_movement_block_get(obj);
// eo -> legacy
if (mode == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
return ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL;
else if (mode == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
return ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL;
if (mode & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
mode2 |= ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL;
else if (mode & EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
mode2 |= ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL;
return ELM_SCROLLER_MOVEMENT_NO_BLOCK;
if (mode2 == 0) return ELM_SCROLLER_MOVEMENT_NO_BLOCK;
return mode2;
}
EAPI void