summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-04-24 17:14:15 -0300
committerRafael Antognolli <rafael.antognolli@intel.com>2013-04-24 17:43:10 -0300
commitf18174f30248dde2e2f9afb662f05f6709bd40e3 (patch)
tree5b05f7995fbee22b253a2c623588571bd1c567f4
parent637f7825be7036db39eeef8eda2c9541d1e0e7f6 (diff)
downloadefl-f18174f30248dde2e2f9afb662f05f6709bd40e3.tar.gz
ecore_evas/wayland: Fix rotation when going back to 0 or 180 degrees.
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 805c3cf8c4..66094c68f9 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -275,10 +275,26 @@ _ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize)
{
int fw, fh;
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
- ecore_wl_window_resize(wdata->win, ee->h + fh, ee->w + fw, 0);
- ecore_wl_window_update_size(wdata->win, ee->h + fh, ee->w + fw);
- evas_output_size_set(ee->evas, ee->req.w + fw, ee->req.h + fh);
- evas_output_viewport_set(ee->evas, 0, 0, ee->req.w + fw, ee->req.h + fh);
+ if ((rotation == 0) || (rotation == 180))
+ {
+ ecore_wl_window_resize(wdata->win, ee->h + fw, ee->w + fh, 0);
+ ecore_wl_window_update_size(wdata->win, ee->h + fw, ee->w + fh);
+ }
+ else
+ {
+ ecore_wl_window_resize(wdata->win, ee->h + fh, ee->w + fw, 0);
+ ecore_wl_window_update_size(wdata->win, ee->h + fh, ee->w + fw);
+ }
+ if ((ee->rotation == 0) || (ee->rotation == 180))
+ {
+ evas_output_size_set(ee->evas, ee->w + fw, ee->h + fh);
+ evas_output_viewport_set(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
+ }
+ else
+ {
+ evas_output_size_set(ee->evas, ee->h + fw, ee->w + fh);
+ evas_output_viewport_set(ee->evas, 0, 0, ee->h + fw, ee->w + fh);
+ }
}
else
{