forked from enlightenment/efl
Evas: Rename Draggable_Interface to Efl.Ui.Draggable
This commit is contained in:
parent
e691de04be
commit
d67171940f
|
@ -10,7 +10,7 @@ evas_eolian_pub_files = \
|
|||
lib/evas/canvas/evas_common_interface.eo \
|
||||
lib/evas/canvas/evas_canvas.eo \
|
||||
lib/evas/canvas/efl_canvas_image_internal.eo \
|
||||
lib/evas/canvas/evas_draggable_interface.eo \
|
||||
lib/evas/canvas/efl_ui_draggable.eo \
|
||||
lib/evas/canvas/efl_ui_clickable.eo \
|
||||
lib/evas/canvas/evas_scrollable_interface.eo \
|
||||
lib/evas/canvas/evas_selectable_interface.eo \
|
||||
|
|
|
@ -1250,7 +1250,7 @@ _efl_ui_image_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
|
|||
* Turns on editing through drag and drop and copy and paste.
|
||||
*/
|
||||
EOLIAN static void
|
||||
_efl_ui_image_evas_draggable_interface_drag_target_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool edit)
|
||||
_efl_ui_image_efl_ui_draggable_drag_target_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool edit)
|
||||
{
|
||||
if (sd->edje)
|
||||
{
|
||||
|
@ -1281,7 +1281,7 @@ _efl_ui_image_evas_draggable_interface_drag_target_set(Eo *obj, Efl_Ui_Image_Dat
|
|||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
_efl_ui_image_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
|
||||
_efl_ui_image_efl_ui_draggable_drag_target_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
|
||||
{
|
||||
return sd->edit;
|
||||
}
|
||||
|
@ -1711,13 +1711,13 @@ elm_image_smooth_get(const Evas_Object *obj)
|
|||
EAPI void
|
||||
elm_image_editable_set(Evas_Object *obj, Eina_Bool edit)
|
||||
{
|
||||
evas_draggable_interface_drag_target_set(obj, edit);
|
||||
efl_ui_draggable_drag_target_set(obj, edit);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
elm_image_editable_get(const Evas_Object *obj)
|
||||
{
|
||||
return evas_draggable_interface_drag_target_get(obj);
|
||||
return efl_ui_draggable_drag_target_get(obj);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
|
|
|
@ -44,7 +44,7 @@ struct Efl.Ui.Image.Error
|
|||
open_error: bool;
|
||||
}
|
||||
|
||||
class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Evas.Draggable_Interface,
|
||||
class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
|
||||
Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
|
||||
Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action,
|
||||
Edje.Object, Efl.Orientation, Efl.Flipable)
|
||||
|
@ -165,8 +165,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Evas.Draggable_Interface,
|
|||
Evas.Object.Smart.del;
|
||||
Evas.Object.Smart.member_add;
|
||||
Evas.Object.Smart.resize;
|
||||
Evas.Draggable_Interface.drag_target.set;
|
||||
Evas.Draggable_Interface.drag_target.get;
|
||||
Efl.Ui.Draggable.drag_target.set;
|
||||
Efl.Ui.Draggable.drag_target.get;
|
||||
Elm.Widget.theme_apply;
|
||||
Elm.Widget.event;
|
||||
Elm.Interface.Atspi_Image.extents.get;
|
||||
|
|
|
@ -572,7 +572,7 @@ _item_mouse_move_cb(void *data,
|
|||
if ((it->dragging) && (it->down))
|
||||
{
|
||||
ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
|
||||
eo_event_callback_call(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it);
|
||||
eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -625,13 +625,13 @@ _item_mouse_move_cb(void *data,
|
|||
|
||||
if (!elm_widget_mirrored_get(WIDGET(it)))
|
||||
{
|
||||
left_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT;
|
||||
right_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT;
|
||||
left_drag = EFL_UI_EVENT_DRAG_START_LEFT;
|
||||
right_drag = EFL_UI_EVENT_DRAG_START_RIGHT;
|
||||
}
|
||||
else
|
||||
{
|
||||
left_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT;
|
||||
right_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT;
|
||||
left_drag = EFL_UI_EVENT_DRAG_START_RIGHT;
|
||||
right_drag = EFL_UI_EVENT_DRAG_START_LEFT;
|
||||
}
|
||||
|
||||
it->dragging = 1;
|
||||
|
@ -646,7 +646,7 @@ _item_mouse_move_cb(void *data,
|
|||
{
|
||||
if (ady > adx)
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_UP, eo_it);
|
||||
else
|
||||
{
|
||||
if (dx < 0)
|
||||
|
@ -657,7 +657,7 @@ _item_mouse_move_cb(void *data,
|
|||
{
|
||||
if (ady > adx)
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_DOWN, eo_it);
|
||||
else
|
||||
{
|
||||
if (dx < 0)
|
||||
|
@ -1060,7 +1060,7 @@ _item_mouse_up_cb(void *data,
|
|||
{
|
||||
it->dragging = EINA_FALSE;
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_STOP, eo_it);
|
||||
dragged = EINA_TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -3864,7 +3864,7 @@ _item_mouse_move_cb(void *data,
|
|||
}
|
||||
ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
|
||||
return;
|
||||
}
|
||||
if ((!it->down) || (sd->longpressed))
|
||||
|
@ -3941,30 +3941,30 @@ _item_mouse_move_cb(void *data,
|
|||
{
|
||||
if (ady > adx)
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_UP, eo_it);
|
||||
else
|
||||
{
|
||||
if (dx < 0)
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_LEFT, eo_it);
|
||||
else
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_RIGHT, eo_it);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ady > adx)
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_DOWN, eo_it);
|
||||
else
|
||||
{
|
||||
if (dx < 0)
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_LEFT, eo_it);
|
||||
else
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it);
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_START_RIGHT, eo_it);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -4157,7 +4157,7 @@ _item_multi_down_cb(void *data,
|
|||
{
|
||||
it->dragging = EINA_FALSE;
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it));
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_STOP, EO_OBJ(it));
|
||||
}
|
||||
ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
|
||||
if (sd->on_hold)
|
||||
|
@ -4878,7 +4878,7 @@ _item_mouse_up_cb(void *data,
|
|||
{
|
||||
it->dragging = EINA_FALSE;
|
||||
eo_event_callback_call
|
||||
(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it));
|
||||
(WIDGET(it), EFL_UI_EVENT_DRAG_STOP, EO_OBJ(it));
|
||||
dragged = 1;
|
||||
}
|
||||
ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
|
||||
|
|
|
@ -109,7 +109,7 @@ _drag_done_cb(void *unused EINA_UNUSED,
|
|||
ELM_PHOTO_DATA_GET(obj, sd);
|
||||
|
||||
elm_object_scroll_freeze_pop(obj);
|
||||
eo_event_callback_call(obj, EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_END, NULL);
|
||||
eo_event_callback_call(obj, EFL_UI_EVENT_DRAG_END, NULL);
|
||||
sd->drag_started = EINA_FALSE;
|
||||
}
|
||||
|
||||
|
@ -174,7 +174,7 @@ _long_press_cb(void *obj)
|
|||
{
|
||||
elm_object_scroll_freeze_push(obj);
|
||||
eo_event_callback_call
|
||||
(obj, EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START, NULL);
|
||||
(obj, EFL_UI_EVENT_DRAG_START, NULL);
|
||||
sd->drag_started = EINA_TRUE;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Evas.Draggable_Interface)
|
||||
class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable)
|
||||
{
|
||||
legacy_prefix: elm_photo;
|
||||
eo_prefix: elm_obj_photo;
|
||||
|
|
|
@ -654,7 +654,7 @@ elm_thumb_ethumb_client_connected_get(void)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_elm_thumb_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Thumb_Data *sd, Eina_Bool edit)
|
||||
_elm_thumb_efl_ui_draggable_drag_target_set(Eo *obj, Elm_Thumb_Data *sd, Eina_Bool edit)
|
||||
{
|
||||
edit = !!edit;
|
||||
if (sd->edit == edit) return;
|
||||
|
@ -677,7 +677,7 @@ _elm_thumb_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Thumb_Data *sd,
|
|||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
_elm_thumb_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Elm_Thumb_Data *sd)
|
||||
_elm_thumb_efl_ui_draggable_drag_target_get(Eo *obj EINA_UNUSED, Elm_Thumb_Data *sd)
|
||||
{
|
||||
return sd->edit;
|
||||
}
|
||||
|
@ -704,14 +704,14 @@ elm_thumb_file_get(const Eo *obj, const char **file, const char **key)
|
|||
EAPI Eina_Bool
|
||||
elm_thumb_editable_set(Evas_Object *obj, Eina_Bool edit)
|
||||
{
|
||||
evas_draggable_interface_drag_target_set(obj, edit);
|
||||
efl_ui_draggable_drag_target_set(obj, edit);
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
elm_thumb_editable_get(const Evas_Object *obj)
|
||||
{
|
||||
return evas_draggable_interface_drag_target_get(obj);
|
||||
return efl_ui_draggable_drag_target_get(obj);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
|
||||
Evas.Draggable_Interface)
|
||||
Efl.Ui.Draggable)
|
||||
{
|
||||
legacy_prefix: elm_thumb;
|
||||
eo_prefix: elm_obj_thumb;
|
||||
|
@ -14,8 +14,8 @@ class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
|
|||
Evas.Object.Smart.add;
|
||||
Evas.Object.Smart.del;
|
||||
Evas.Object.Smart.show;
|
||||
Evas.Draggable_Interface.drag_target.set;
|
||||
Evas.Draggable_Interface.drag_target.get;
|
||||
Efl.Ui.Draggable.drag_target.set;
|
||||
Efl.Ui.Draggable.drag_target.get;
|
||||
}
|
||||
events {
|
||||
generate,error;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# error You shall not include this header directly
|
||||
#endif
|
||||
|
||||
#include "canvas/evas_draggable_interface.eo.h"
|
||||
#include "canvas/efl_ui_draggable.eo.h"
|
||||
#include "canvas/efl_ui_clickable.eo.h"
|
||||
#include "canvas/evas_scrollable_interface.eo.h"
|
||||
#include "canvas/evas_selectable_interface.eo.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "evas_common_private.h"
|
||||
#include "evas_private.h"
|
||||
|
||||
#include "canvas/evas_draggable_interface.eo.c"
|
||||
#include "canvas/efl_ui_draggable.eo.c"
|
||||
#include "canvas/efl_ui_clickable.eo.c"
|
||||
#include "canvas/evas_scrollable_interface.eo.c"
|
||||
#include "canvas/evas_selectable_interface.eo.c"
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
interface Evas.Draggable_Interface ()
|
||||
interface Efl.Ui.Draggable ()
|
||||
{
|
||||
event_prefix: efl_ui;
|
||||
methods {
|
||||
@property drag_target {
|
||||
[[Contrtol whether the object's content is changed by drag and drop.
|
||||
|
||||
If $drag_target is true, the object can be target of dragging object and
|
||||
the content of this object can be changed into dragging content.
|
||||
For example, If object deals with image and $drag_target is true, user can drag
|
||||
new image and drop it into this object.
|
||||
And then this object's image can be changed into new image.]]
|
||||
If $drag_target is true, the object can be target of dragging
|
||||
object and the content of this object can be changed into
|
||||
dragging content. For example, If object deals with image and
|
||||
$drag_target is true, user can drag new image and drop it into
|
||||
this object. And then this object's image can be changed into
|
||||
new image.]]
|
||||
set {
|
||||
}
|
||||
get {
|
||||
|
@ -18,7 +20,7 @@ interface Evas.Draggable_Interface ()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
events {
|
||||
drag;
|
||||
drag,start;
|
Loading…
Reference in New Issue