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

ecore_evas - applied macro to check rotation state. 

also, let the potrait compare on the higher priority.

if you can suggest better macro name, then please modify it.
This commit is contained in:
ChunEon Park 2014-01-18 22:26:10 +09:00
parent 8cd92c17e0
commit 892b1c5be3
8 changed files with 184 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/lib/ecore_evas/ecore_evas.c
View File

@ -1157,14 +1157,14 @@ ecore_evas_resize(Ecore_Evas *ee, int w, int h)
if (ee->prop.fullscreen) return; if (ee->prop.fullscreen) return;
if (w < 1) w = 1; if (w < 1) w = 1;
if (h < 1) h = 1; if (h < 1) h = 1;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
IFC(ee, fn_resize) (ee, h, w); IFC(ee, fn_resize) (ee, w, h);
IFE; IFE;
} }
else else
{ {
IFC(ee, fn_resize) (ee, w, h); IFC(ee, fn_resize) (ee, h, w);
IFE; IFE;
} }
} }
@ -1181,14 +1181,14 @@ ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
if (ee->prop.fullscreen) return; if (ee->prop.fullscreen) return;
if (w < 1) w = 1; if (w < 1) w = 1;
if (h < 1) h = 1; if (h < 1) h = 1;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
IFC(ee, fn_move_resize) (ee, x, y, h, w); IFC(ee, fn_move_resize) (ee, x, y, w, h);
IFE; IFE;
} }
else else
{ {
IFC(ee, fn_move_resize) (ee, x, y, w, h); IFC(ee, fn_move_resize) (ee, x, y, h, w);
IFE; IFE;
} }
} }
@ -1202,20 +1202,20 @@ ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h)
"ecore_evas_geometry_get"); "ecore_evas_geometry_get");
return; return;
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
if (x) *x = ee->x;
if (y) *y = ee->y;
if (w) *w = ee->h;
if (h) *h = ee->w;
}
else
{ {
if (x) *x = ee->x; if (x) *x = ee->x;
if (y) *y = ee->y; if (y) *y = ee->y;
if (w) *w = ee->w; if (w) *w = ee->w;
if (h) *h = ee->h; if (h) *h = ee->h;
} }
else
{
if (x) *x = ee->x;
if (y) *y = ee->y;
if (w) *w = ee->h;
if (h) *h = ee->w;
}
} }
EAPI void EAPI void
@ -1227,20 +1227,20 @@ ecore_evas_request_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, in
"ecore_evas_request_geometry_get"); "ecore_evas_request_geometry_get");
return; return;
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
if (x) *x = ee->req.x;
if (y) *y = ee->req.y;
if (w) *w = ee->req.h;
if (h) *h = ee->req.w;
}
else
{ {
if (x) *x = ee->req.x; if (x) *x = ee->req.x;
if (y) *y = ee->req.y; if (y) *y = ee->req.y;
if (w) *w = ee->req.w; if (w) *w = ee->req.w;
if (h) *h = ee->req.h; if (h) *h = ee->req.h;
} }
else
{
if (x) *x = ee->req.x;
if (y) *y = ee->req.y;
if (w) *w = ee->req.h;
if (h) *h = ee->req.w;
}
} }
EAPI void EAPI void
@ -1505,14 +1505,14 @@ ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h)
} }
if (w < 0) w = 0; if (w < 0) w = 0;
if (h < 0) h = 0; if (h < 0) h = 0;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
IFC(ee, fn_size_min_set) (ee, h, w); IFC(ee, fn_size_min_set) (ee, w, h);
IFE; IFE;
} }
else else
{ {
IFC(ee, fn_size_min_set) (ee, w, h); IFC(ee, fn_size_min_set) (ee, h, w);
IFE; IFE;
} }
} }
@ -1526,16 +1526,16 @@ ecore_evas_size_min_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_min_get"); "ecore_evas_size_min_get");
return; return;
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
if (w) *w = ee->prop.min.h;
if (h) *h = ee->prop.min.w;
}
else
{ {
if (w) *w = ee->prop.min.w; if (w) *w = ee->prop.min.w;
if (h) *h = ee->prop.min.h; if (h) *h = ee->prop.min.h;
} }
else
{
if (w) *w = ee->prop.min.h;
if (h) *h = ee->prop.min.w;
}
} }
EAPI void EAPI void
@ -1549,14 +1549,14 @@ ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h)
} }
if (w < 0) w = 0; if (w < 0) w = 0;
if (h < 0) h = 0; if (h < 0) h = 0;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
IFC(ee, fn_size_max_set) (ee, h, w); IFC(ee, fn_size_max_set) (ee, w, h);
IFE; IFE;
} }
else else
{ {
IFC(ee, fn_size_max_set) (ee, w, h); IFC(ee, fn_size_max_set) (ee, h, w);
IFE; IFE;
} }
} }
@ -1570,16 +1570,16 @@ ecore_evas_size_max_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_max_get"); "ecore_evas_size_max_get");
return; return;
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
if (w) *w = ee->prop.max.h;
if (h) *h = ee->prop.max.w;
}
else
{ {
if (w) *w = ee->prop.max.w; if (w) *w = ee->prop.max.w;
if (h) *h = ee->prop.max.h; if (h) *h = ee->prop.max.h;
} }
else
{
if (w) *w = ee->prop.max.h;
if (h) *h = ee->prop.max.w;
}
} }
EAPI void EAPI void
@ -1593,14 +1593,14 @@ ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h)
} }
if (w < 0) w = 0; if (w < 0) w = 0;
if (h < 0) h = 0; if (h < 0) h = 0;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
IFC(ee, fn_size_base_set) (ee, h, w); IFC(ee, fn_size_base_set) (ee, w, h);
IFE; IFE;
} }
else else
{ {
IFC(ee, fn_size_base_set) (ee, w, h); IFC(ee, fn_size_base_set) (ee, h, w);
IFE; IFE;
} }
} }
@ -1614,16 +1614,16 @@ ecore_evas_size_base_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_base_get"); "ecore_evas_size_base_get");
return; return;
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
if (w) *w = ee->prop.base.h;
if (h) *h = ee->prop.base.w;
}
else
{ {
if (w) *w = ee->prop.base.w; if (w) *w = ee->prop.base.w;
if (h) *h = ee->prop.base.h; if (h) *h = ee->prop.base.h;
} }
else
{
if (w) *w = ee->prop.base.h;
if (h) *h = ee->prop.base.w;
}
} }
EAPI void EAPI void
@ -1637,14 +1637,14 @@ ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h)
} }
if (w < 0) w = 0; if (w < 0) w = 0;
if (h < 0) h = 0; if (h < 0) h = 0;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
IFC(ee, fn_size_step_set) (ee, h, w); IFC(ee, fn_size_step_set) (ee, w, h);
IFE; IFE;
} }
else else
{ {
IFC(ee, fn_size_step_set) (ee, w, h); IFC(ee, fn_size_step_set) (ee, h, w);
IFE; IFE;
} }
} }
@ -1658,16 +1658,16 @@ ecore_evas_size_step_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_step_get"); "ecore_evas_size_step_get");
return; return;
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
if (w) *w = ee->prop.step.h;
if (h) *h = ee->prop.step.w;
}
else
{ {
if (w) *w = ee->prop.step.w; if (w) *w = ee->prop.step.w;
if (h) *h = ee->prop.step.h; if (h) *h = ee->prop.step.h;
} }
else
{
if (w) *w = ee->prop.step.h;
if (h) *h = ee->prop.step.w;
}
} }
EAPI void EAPI void

3
src/lib/ecore_evas/ecore_evas_private.h
View File

@ -33,6 +33,9 @@ EAPI extern int _ecore_evas_log_dom;
#endif #endif
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__) #define CRI(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__)
#define ECORE_EVAS_PORTRAIT(ee) \
((ee->rotation == 0) || (ee->rotation == 180))
#define IDLE_FLUSH_TIME 0.5 #define IDLE_FLUSH_TIME 0.5
#ifndef _ECORE_EVAS_H #ifndef _ECORE_EVAS_H

55
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
View File

@ -84,10 +84,10 @@ _ecore_evas_fb_gain(void *data)
if (ee) if (ee)
{ {
ee->visible = 1; ee->visible = 1;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
} }
EINA_LIST_FOREACH(ecore_evas_input_devices, ll, dev) EINA_LIST_FOREACH(ecore_evas_input_devices, ll, dev)
@ -286,18 +286,18 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
if ((w == ee->w) && (h == ee->h)) return; if ((w == ee->w) && (h == ee->h)) return;
ee->w = w; ee->w = w;
ee->h = h; ee->h = h;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
} }
@ -309,18 +309,18 @@ _ecore_evas_move_resize(Ecore_Evas *ee, int x EINA_UNUSED, int y EINA_UNUSED, in
if ((w == ee->w) && (h == ee->h)) return; if ((w == ee->w) && (h == ee->h)) return;
ee->w = w; ee->w = w;
ee->h = h; ee->h = h;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
} }
@ -355,7 +355,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
} }
else else
{ {
if ((rotation == 0) || (rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@ -377,10 +377,11 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
} }
ee->rotation = rotation; ee->rotation = rotation;
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
_ecore_evas_mouse_move_process_fb(ee, ee->mouse.x, ee->mouse.y); _ecore_evas_mouse_move_process_fb(ee, ee->mouse.x, ee->mouse.y);
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
} }
@ -625,16 +626,16 @@ ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h)
evas_data_attach_set(ee->evas, ee); evas_data_attach_set(ee->evas, ee);
evas_output_method_set(ee->evas, rmethod); evas_output_method_set(ee->evas, rmethod);
if ((rotation == 90) || (rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, h, w);
evas_output_viewport_set(ee->evas, 0, 0, h, w);
}
else
{ {
evas_output_size_set(ee->evas, w, h); evas_output_size_set(ee->evas, w, h);
evas_output_viewport_set(ee->evas, 0, 0, w, h); evas_output_viewport_set(ee->evas, 0, 0, w, h);
} }
else
{
evas_output_size_set(ee->evas, h, w);
evas_output_viewport_set(ee->evas, 0, 0, h, w);
}
einfo = (Evas_Engine_Info_FB *)evas_engine_info_get(ee->evas); einfo = (Evas_Engine_Info_FB *)evas_engine_info_get(ee->evas);
if (einfo && disp_name) if (einfo && disp_name)

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

@ -219,20 +219,20 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh); evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
minw = (ee->prop.min.w + fh);
minh = (ee->prop.min.h + fw);
maxw = (ee->prop.max.w + fh);
maxh = (ee->prop.max.h + fw);
}
else
{ {
minw = (ee->prop.min.w + fw); minw = (ee->prop.min.w + fw);
minh = (ee->prop.min.h + fh); minh = (ee->prop.min.h + fh);
maxw = (ee->prop.max.w + fw); maxw = (ee->prop.max.w + fw);
maxh = (ee->prop.max.h + fh); maxh = (ee->prop.max.h + fh);
} }
else
{
minw = (ee->prop.min.w + fh);
minh = (ee->prop.min.h + fw);
maxw = (ee->prop.max.w + fh);
maxh = (ee->prop.max.h + fw);
}
/* adjust size using aspect */ /* adjust size using aspect */
if ((ee->prop.base.w >= 0) && (ee->prop.base.h >= 0)) if ((ee->prop.base.w >= 0) && (ee->prop.base.h >= 0))
@ -303,16 +303,17 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
orig_w = nw; orig_w = nw;
orig_h = nh; orig_h = nh;
if ((ee->rotation == 90) || (ee->rotation == 270))
{
nw -= fh;
nh -= fw;
} }
else if (ECORE_EVAS_PORTRAIT(ee))
{ {
nw -= fw; nw -= fw;
nh -= fh; nh -= fh;
} }
else
{
nw -= fh;
nh -= fw;
}
} }
if (prev_full != ee->prop.fullscreen) if (prev_full != ee->prop.fullscreen)
@ -407,7 +408,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
} }
/* add canvas damage */ /* add canvas damage */
if ((ee->rotation == 0) || (ee->rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h);
else else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w); evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w);
@ -436,7 +437,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
/* add canvas damage */ /* add canvas damage */
if ((ee->rotation == 0) || (ee->rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w); evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
@ -485,7 +486,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
/* add canvas damage */ /* add canvas damage */
if ((ee->rotation == 0) || (ee->rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w); evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
@ -613,20 +614,20 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
double a; double a;
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh); evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
minw = (ee->prop.min.w - fh);
minh = (ee->prop.min.h - fw);
maxw = (ee->prop.max.w + fh);
maxh = (ee->prop.max.h + fw);
}
else
{ {
minw = (ee->prop.min.w - fw); minw = (ee->prop.min.w - fw);
minh = (ee->prop.min.h - fh); minh = (ee->prop.min.h - fh);
maxw = (ee->prop.max.w + fw); maxw = (ee->prop.max.w + fw);
maxh = (ee->prop.max.h + fh); maxh = (ee->prop.max.h + fh);
} }
else
{
minw = (ee->prop.min.w - fh);
minh = (ee->prop.min.h - fw);
maxw = (ee->prop.max.w + fh);
maxh = (ee->prop.max.h + fw);
}
/* adjust size using aspect */ /* adjust size using aspect */
if ((ee->prop.base.w >= 0) && (ee->prop.base.h >= 0)) if ((ee->prop.base.w >= 0) && (ee->prop.base.h >= 0))
@ -697,16 +698,16 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
orig_w = w; orig_w = w;
orig_h = h; orig_h = h;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
w += fh;
h += fw;
}
else
{ {
w += fw; w += fw;
h += fh; h += fh;
} }
else
{
w += fh;
h += fw;
}
} }
evas_output_size_get(ee->evas, &ow, &oh); evas_output_size_get(ee->evas, &ow, &oh);
@ -717,16 +718,16 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
ee->req.w = orig_w; ee->req.w = orig_w;
ee->req.h = orig_h; ee->req.h = orig_h;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, h, w);
evas_output_viewport_set(ee->evas, 0, 0, h, w);
}
else
{ {
evas_output_size_set(ee->evas, w, h); evas_output_size_set(ee->evas, w, h);
evas_output_viewport_set(ee->evas, 0, 0, w, h); evas_output_viewport_set(ee->evas, 0, 0, w, h);
} }
else
{
evas_output_size_set(ee->evas, h, w);
evas_output_viewport_set(ee->evas, 0, 0, h, w);
}
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
{ {

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

@ -455,7 +455,7 @@ _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location)
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh); evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if ((ee->rotation == 0) || (ee->rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location); ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
else else
ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location); ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);

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

@ -446,10 +446,10 @@ _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location)
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh); evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
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); ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
else
ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
} }
} }

44
src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
View File

@ -376,16 +376,16 @@ _ecore_evas_win32_event_window_configure(void *data EINA_UNUSED, int type EINA_U
ee->req.w = ee->w; ee->req.w = ee->w;
ee->req.h = ee->h; ee->req.h = ee->h;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
{ {
int pdam; int pdam;
@ -481,16 +481,16 @@ _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height)
ee->h = height; ee->h = height;
ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window, ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window,
width, height); width, height);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
{ {
int pdam; int pdam;
@ -528,16 +528,16 @@ _ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int heigh
ee->h = height; ee->h = height;
ecore_win32_window_move_resize((struct _Ecore_Win32_Window *)ee->prop.window, ecore_win32_window_move_resize((struct _Ecore_Win32_Window *)ee->prop.window,
x, y, width, height); x, y, width, height);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
{ {
int pdam; int pdam;
@ -586,7 +586,7 @@ _ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
&w, &h); &w, &h);
ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window, ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window,
h, w); h, w);
if ((rotation == 0) || (rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@ -618,10 +618,10 @@ _ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
} }
static void static void

64
src/modules/ecore_evas/engines/x/ecore_evas_x.c
View File

@ -1373,16 +1373,16 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
ee->h = e->h; ee->h = e->h;
ee->req.w = ee->w; ee->req.w = ee->w;
ee->req.h = ee->h; ee->req.h = ee->h;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
{ {
int pdam; int pdam;
@ -1854,16 +1854,16 @@ _ecore_evas_x_resize(Ecore_Evas *ee, int w, int h)
ee->w = w; ee->w = w;
ee->h = h; ee->h = h;
if (ee->prop.window) ecore_x_window_resize(ee->prop.window, w, h); if (ee->prop.window) ecore_x_window_resize(ee->prop.window, w, h);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
{ {
int pdam; int pdam;
@ -1913,16 +1913,16 @@ _ecore_evas_x_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
} }
ee->w = w; ee->w = w;
ee->h = h; ee->h = h;
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
else
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
} }
else
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
}
if (ee->prop.avoid_damage) if (ee->prop.avoid_damage)
{ {
int pdam; int pdam;
@ -1992,7 +1992,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
ecore_x_window_size_get(ee->prop.window, &w, &h); ecore_x_window_size_get(ee->prop.window, &w, &h);
ecore_x_window_resize(ee->prop.window, h, w); ecore_x_window_resize(ee->prop.window, h, w);
if ((rotation == 0) || (rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
evas_output_size_set(ee->evas, ee->req.w, ee->req.h); evas_output_size_set(ee->evas, ee->req.w, ee->req.h);
evas_output_viewport_set(ee->evas, 0, 0, ee->req.w, ee->req.h); evas_output_viewport_set(ee->evas, 0, 0, ee->req.w, ee->req.h);
@ -2004,17 +2004,17 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
} }
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w);
} }
else else
{ {
/* int w, h; */ /* int w, h; */
/* ecore_x_window_size_get(ee->prop.window, &w, &h); */ /* ecore_x_window_size_get(ee->prop.window, &w, &h); */
if ((rotation == 0) || (rotation == 180)) if (ECORE_EVAS_PORTRAIT(ee))
{ {
evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@ -2025,10 +2025,10 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w); evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
} }
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
} }
ecore_evas_size_min_get(ee, &minw, &minh); ecore_evas_size_min_get(ee, &minw, &minh);
ecore_evas_size_max_get(ee, &maxw, &maxh); ecore_evas_size_max_get(ee, &maxw, &maxh);
@ -2053,10 +2053,10 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
ecore_x_current_time_get()); ecore_x_current_time_get());
if (ee->func.fn_resize) ee->func.fn_resize(ee); if (ee->func.fn_resize) ee->func.fn_resize(ee);
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
} }
} }
@ -3013,10 +3013,10 @@ _avoid_damage_do(Ecore_Evas *ee, int on)
{ {
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
} }
if ((ee->rotation == 90) || (ee->rotation == 270)) if (ECORE_EVAS_PORTRAIT(ee))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
if (ee->prop.avoid_damage == ECORE_EVAS_AVOID_DAMAGE_BUILT_IN) if (ee->prop.avoid_damage == ECORE_EVAS_AVOID_DAMAGE_BUILT_IN)
{ {
edata->using_bg_pixmap = 1; edata->using_bg_pixmap = 1;