diff options
| author | Rafael Antognolli <rafael.antognolli@intel.com> | 2013-04-24 19:32:49 -0300 |
|---|---|---|
| committer | Rafael Antognolli <rafael.antognolli@intel.com> | 2013-04-25 19:58:05 -0300 |
| commit | 6890a0e4520d6d289fcb8a00e89aee435b4ac72c (patch) | |
| tree | 198b6e1acd4dd683896743e1a458f24a0223bf9a | |
| parent | 1ec6dd5fbc2968b6c06cca8a67b871da51222681 (diff) | |
| download | efl-6890a0e4520d6d289fcb8a00e89aee435b4ac72c.tar.gz | |
evas/wayland_shm: Fix resize to the left or top when rotated.
| -rw-r--r-- | src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 10 | ||||
| -rw-r--r-- | src/modules/evas/engines/wayland_shm/evas_engine.c | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index 3070697acc..31adbd7bff 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -526,15 +526,19 @@ _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location) Evas_Engine_Info_Wayland_Shm *einfo; wdata->win->resizing = EINA_TRUE; - if ((einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas))) - einfo->info.edges = wdata->win->edges; + if ((ee->rotation == 90) || (ee->rotation == 270)) + evas_output_framespace_get(ee->evas, NULL, NULL, &fh, &fw); + else + evas_output_framespace_get(ee->evas, NULL, NULL, &fh, &fw); - evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh); + if ((einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas))) if ((ee->rotation == 90) || (ee->rotation == 270)) ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location); else ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location); + einfo->info.edges = location; + } } #endif diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index 9974ca27b1..5bbc478302 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -326,9 +326,15 @@ eng_output_resize(void *data, int w, int h) if (!(info = re->info)) return; if (info->info.edges & 4) - dx = re->ob->w - w; + if ((info->info.rotation == 90) || (info->info.rotation == 270)) + dx = re->ob->h - h; + else + dx = re->ob->w - w; if (info->info.edges & 1) - dy = re->ob->h - h; + if ((info->info.rotation == 90) || (info->info.rotation == 270)) + dy = re->ob->w - w; + else + dy = re->ob->h - h; re->outbuf_reconfigure(re->ob, dx, dy, w, h, info->info.rotation, info->info.depth, |