Thanks, in git! It looks obvious but if anyone has wayland, please test this :)
Alex, I hope you send patches via phabricator + arcanist next time. https://phab.enlightenment.org/w/arcanist/ Thanks. Daniel Juyung Seo (SeoZ) On Thu, Jun 27, 2013 at 9:48 AM, wuzhiwen <zhiwen...@linux.intel.com> wrote: > >From b0b1a8ba528a61abef9e14eb4b840245cd0cfc4d Mon Sep 17 00:00:00 2001 > > From: Alex Wu <zhiwen...@linux.intel.com> > > Date: Tue, 25 Jun 2013 16:33:50 +0800 > > Subject: elm_cnp: Fix building issue when not defined HAVE_ELEMENTARY_X > > > > Put the static function that will be used both by wayland > > and x11 at the common place. > > --- > > src/lib/elm_cnp.c | 36 +++++++++++++++++++----------------- > > 1 file changed, 19 insertions(+), 17 deletions(-) > > > > diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c > > index 79ea9aa..7eb8cd5 100644 > > --- a/src/lib/elm_cnp.c > > +++ b/src/lib/elm_cnp.c > > @@ -172,6 +172,25 @@ static Eina_List *cont_drag_tg = NULL; /* List of > Item_Container_Drag_Info */ > > static void _cont_obj_mouse_up( void *data, Evas *e, Evas_Object *obj, void > *event_info); > > static void _cont_obj_mouse_move( void *data, Evas *e, Evas_Object *obj, > void *event_info); > > > > +static Eina_Bool > > +_drag_cancel_animate(void *data __UNUSED__, double pos) > > +{ /* Animation to "move back" drag-window */ > > + if (pos >= 0.99) > > + { > > + evas_object_del(data); > > + return ECORE_CALLBACK_CANCEL; > > + } > > + else > > + { > > + int x, y; > > + x = dragwin_x_end - (pos * (dragwin_x_end - dragwin_x_start)); > > + y = dragwin_y_end - (pos * (dragwin_y_end - dragwin_y_start)); > > + evas_object_move(data, x, y); > > + } > > + > > + return ECORE_CALLBACK_RENEW; > > +} > > + > > #ifdef HAVE_ELEMENTARY_X > > static Tmp_Info *_tempfile_new (int size); > > static int _tmpinfo_free (Tmp_Info *tmp); > > @@ -1507,24 +1526,7 @@ _x11_dnd_status(void *data __UNUSED__, int etype > __UNUSED__, void *ev) > > return EINA_TRUE; > > } > > > > -static Eina_Bool > > -_drag_cancel_animate(void *data __UNUSED__, double pos) > > -{ /* Animation to "move back" drag-window */ > > - if (pos >= 0.99) > > - { > > - evas_object_del(data); > > - return ECORE_CALLBACK_CANCEL; > > - } > > - else > > - { > > - int x, y; > > - x = dragwin_x_end - (pos * (dragwin_x_end - dragwin_x_start)); > > - y = dragwin_y_end - (pos * (dragwin_y_end - dragwin_y_start)); > > - evas_object_move(data, x, y); > > - } > > > > - return ECORE_CALLBACK_RENEW; > > -} > > > > static Eina_Bool > > _x11_drag_mouse_up(void *data, int etype __UNUSED__, void *event) > > -- > > 1.7.9.5 > > > > > > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by Windows: > > Build for Windows Store. > > http://p.sf.net/sfu/windows-dev2dev > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
