forked from enlightenment/efl
ecore_evas_wayland: fix bug ee's width and height were updated wrong place.
ecore evas manages the width and height using the ee->w/h and ee->req.w/h. but sometimes only ee->req value can be updated.
This commit is contained in:
parent
591db71120
commit
fb730c1fd7
|
@ -940,6 +940,12 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
|
||||||
|
|
||||||
ee->req.w = w;
|
ee->req.w = w;
|
||||||
ee->req.h = h;
|
ee->req.h = h;
|
||||||
|
|
||||||
|
/* TODO: wayland client can resize the ecore_evas directly.
|
||||||
|
* In the future, we will remove ee->req value in wayland backend */
|
||||||
|
ee->w = w;
|
||||||
|
ee->h = h;
|
||||||
|
|
||||||
orig_w = w;
|
orig_w = w;
|
||||||
orig_h = h;
|
orig_h = h;
|
||||||
|
|
||||||
|
@ -1057,6 +1063,11 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
|
||||||
orig_w = w;
|
orig_w = w;
|
||||||
orig_h = h;
|
orig_h = h;
|
||||||
|
|
||||||
|
ee->w = orig_w;
|
||||||
|
ee->h = orig_h;
|
||||||
|
ee->req.w = orig_w;
|
||||||
|
ee->req.h = orig_h;
|
||||||
|
|
||||||
if (ECORE_EVAS_PORTRAIT(ee))
|
if (ECORE_EVAS_PORTRAIT(ee))
|
||||||
{
|
{
|
||||||
w += fw;
|
w += fw;
|
||||||
|
@ -1078,11 +1089,6 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
|
||||||
|
|
||||||
if (diff)
|
if (diff)
|
||||||
{
|
{
|
||||||
ee->w = orig_w;
|
|
||||||
ee->h = orig_h;
|
|
||||||
ee->req.w = orig_w;
|
|
||||||
ee->req.h = orig_h;
|
|
||||||
|
|
||||||
if (ECORE_EVAS_PORTRAIT(ee))
|
if (ECORE_EVAS_PORTRAIT(ee))
|
||||||
{
|
{
|
||||||
evas_output_size_set(ee->evas, w, h);
|
evas_output_size_set(ee->evas, w, h);
|
||||||
|
|
Loading…
Reference in New Issue