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

wayland ecore evas: move move_resize to common 

It's identical in both shm and egl variants, share it.
This commit is contained in:
Derek Foreman 2016-11-01 07:42:23 -05:00
parent d960adee72
commit b898d3f929
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -991,6 +991,18 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
}
}
void
_ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
if ((ee->x != x) || (ee->y != y))
_ecore_evas_wl_common_move(ee, x, y);
if ((ee->w != w) || (ee->h != h))
_ecore_evas_wl_common_resize(ee, w, h);
}
void
_ecore_evas_wl_common_callback_resize_set(Ecore_Evas *ee, void (*func)(Ecore_Evas *ee))
{

15
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -34,7 +34,6 @@ extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas *eo_e);
extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
/* local function prototypes */
static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
static void _ecore_evas_wl_show(Ecore_Evas *ee);
static void _ecore_evas_wl_hide(Ecore_Evas *ee);
static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha);
@ -61,7 +60,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
_ecore_evas_wl_common_move,
NULL, // managed_move
_ecore_evas_wl_common_resize,
_ecore_evas_wl_move_resize,
_ecore_evas_wl_common_move_resize,
_ecore_evas_wl_rotation_set,
NULL, // shaped_set
_ecore_evas_wl_show,
@ -450,18 +449,6 @@ conn_err:
return NULL;
}
static void
_ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
if ((ee->x != x) || (ee->y != y))
_ecore_evas_wl_common_move(ee, x, y);
if ((ee->w != w) || (ee->h != h))
_ecore_evas_wl_common_resize(ee, w, h);
}
static void
_ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize)
{

1
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
View File

@ -71,6 +71,7 @@ void _ecore_evas_wl_common_callback_mouse_in_set(Ecore_Evas *ee, void (*func)(Ec
void _ecore_evas_wl_common_callback_mouse_out_set(Ecore_Evas *ee, void (*func)(Ecore_Evas *ee));
void _ecore_evas_wl_common_move(Ecore_Evas *ee, int x, int y);
void _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h);
void _ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
void _ecore_evas_wl_common_raise(Ecore_Evas *ee);
void _ecore_evas_wl_common_title_set(Ecore_Evas *ee, const char *title);
void _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const char *c);

15
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -31,7 +31,6 @@
#endif /* ! _WIN32 */
/* local function prototypes */
static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
static void _ecore_evas_wl_show(Ecore_Evas *ee);
static void _ecore_evas_wl_hide(Ecore_Evas *ee);
static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha);
@ -58,7 +57,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
_ecore_evas_wl_common_move,
NULL, // managed_move
_ecore_evas_wl_common_resize,
_ecore_evas_wl_move_resize,
_ecore_evas_wl_common_move_resize,
_ecore_evas_wl_rotation_set,
NULL, // shaped_set
_ecore_evas_wl_show,
@ -379,18 +378,6 @@ conn_err:
return NULL;
}
static void
_ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
if ((ee->x != x) || (ee->y != y))
_ecore_evas_wl_common_move(ee, x, y);
if ((ee->w != w) || (ee->h != h))
_ecore_evas_wl_common_resize(ee, w, h);
}
static void
_ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize)
{