From: jypark Date: Mon, 31 Oct 2011 10:46:35 +0000 (+0000) Subject: [*] Applied upstream r64554. X-Git-Tag: accepted/2.0/20130306.224007~145 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0938958a584e8ea6d50c925d1ab178c919e16e40;p=profile%2Fivi%2Fecore.git [*] Applied upstream r64554. Implement ee's req value to other windowing system. currently only x windowing system implement this value. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@64554 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/ecore_evas/ecore_evas_directfb.c b/src/lib/ecore_evas/ecore_evas_directfb.c index 826a704..112f4a2 100644 --- a/src/lib/ecore_evas/ecore_evas_directfb.c +++ b/src/lib/ecore_evas/ecore_evas_directfb.c @@ -525,6 +525,10 @@ ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w ee->y = y; ee->w = w; ee->h = h; + ee->req.x = ee->x; + ee->req.y = ee->y; + ee->req.w = ee->w; + ee->req.h = ee->h; ee->prop.layer = 1; ee->prop.fullscreen = 0; diff --git a/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c index 01afab5..26081a0 100644 --- a/src/lib/ecore_evas/ecore_evas_ews.c +++ b/src/lib/ecore_evas/ecore_evas_ews.c @@ -178,6 +178,9 @@ _ecore_evas_ews_free(Ecore_Evas *ee) static void _ecore_evas_ews_move(Ecore_Evas *ee, int x, int y) { + ee->req.x = x; + ee->req.y = y; + if ((x == ee->x) && (y == ee->y)) return; ee->x = x; ee->y = y; @@ -190,6 +193,9 @@ _ecore_evas_ews_move(Ecore_Evas *ee, int x, int y) static void _ecore_evas_ews_managed_move(Ecore_Evas *ee, int x, int y) { + ee->req.x = x; + ee->req.y = y; + if ((x == ee->x) && (y == ee->y)) return; ee->x = x; ee->y = y; @@ -237,6 +243,10 @@ _ecore_evas_ews_resize(Ecore_Evas *ee, int w, int h) { if (w < 1) w = 1; if (h < 1) h = 1; + + ee->req.w = w; + ee->req.h = h; + if ((w == ee->w) && (h == ee->h)) return; ee->w = w; ee->h = h; @@ -1096,6 +1106,10 @@ ecore_evas_ews_new(int x, int y, int w, int h) ee->y = 0; ee->w = w; ee->h = h; + ee->req.x = ee->x; + ee->req.y = ee->y; + ee->req.w = ee->w; + ee->req.h = ee->h; /* init evas here */ ee->evas = evas_new(); diff --git a/src/lib/ecore_evas/ecore_evas_win32.c b/src/lib/ecore_evas/ecore_evas_win32.c index ca7e3ef..6203273 100644 --- a/src/lib/ecore_evas/ecore_evas_win32.c +++ b/src/lib/ecore_evas/ecore_evas_win32.c @@ -297,6 +297,9 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE { ee->x = e->x; ee->y = e->y; + ee->req.x = ee->x; + ee->req.y = ee->y; + if (ee->func.fn_move) ee->func.fn_move(ee); } @@ -304,6 +307,9 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE { ee->w = e->width; ee->h = e->height; + ee->req.w = ee->w; + ee->req.h = ee->h; + if ((ee->rotation == 90) || (ee->rotation == 270)) { evas_output_size_set(ee->evas, ee->h, ee->w); @@ -383,6 +389,8 @@ static void _ecore_evas_win32_move(Ecore_Evas *ee, int x, int y) { INF("ecore evas move (%dx%d)", x, y); + ee->req.x = x; + ee->req.y = y; if ((x != ee->x) || (y != ee->y)) { @@ -398,6 +406,8 @@ static void _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height) { INF("ecore evas resize (%dx%d)", width, height); + ee->req.w = width; + ee->req.h = height; if ((ee->w != width) || (ee->h != height)) { @@ -433,6 +443,10 @@ static void _ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int height) { INF("ecore evas resize (%dx%d %dx%d)", x, y, width, height); + ee->req.x = x; + ee->req.y = y; + ee->req.w = width; + ee->req.h = height; if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y)) { @@ -1171,6 +1185,10 @@ _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_init)(Ecore_Evas *ee), ee->y = y; ee->w = width; ee->h = height; + ee->req.x = ee->x; + ee->req.y = ee->y; + ee->req.w = ee->w; + ee->req.h = ee->h; ee->prop.max.w = 32767; ee->prop.max.h = 32767; diff --git a/src/lib/ecore_evas/ecore_evas_wince.c b/src/lib/ecore_evas/ecore_evas_wince.c index ee8387b..216e85d 100644 --- a/src/lib/ecore_evas/ecore_evas_wince.c +++ b/src/lib/ecore_evas/ecore_evas_wince.c @@ -314,6 +314,8 @@ static void _ecore_evas_wince_move(Ecore_Evas *ee, int x, int y) { INF("ecore evas move (%dx%d)", x, y); + ee->req.x = x; + ee->req.y = y; if ((x != ee->x) || (y != ee->y)) { @@ -328,6 +330,8 @@ static void _ecore_evas_wince_resize(Ecore_Evas *ee, int width, int height) { INF("ecore evas resize (%dx%d)", width, height); + ee->req.w = width; + ee->req.h = height; if ((ee->w != width) || (ee->h != height)) { @@ -354,6 +358,10 @@ static void _ecore_evas_wince_move_resize(Ecore_Evas *ee, int x, int y, int width, int height) { INF("ecore evas resize (%dx%d %dx%d)", x, y, width, height); + ee->req.x = x; + ee->req.y = y; + ee->req.w = width; + ee->req.h = height; if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y)) { @@ -773,6 +781,10 @@ ecore_evas_software_wince_new_internal(int backend, ee->y = y; ee->w = width; ee->h = height; + ee->req.x = ee->x; + ee->req.y = ee->y; + ee->req.w = ee->w; + ee->req.h = ee->h; ee->prop.max.w = 32767; ee->prop.max.h = 32767;