raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=cc726c011efca9ecb589886cf13d047c164ee39e

commit cc726c011efca9ecb589886cf13d047c164ee39e
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Tue Jun 26 12:25:17 2018 +0900

    Revert "elm win - fix resizing on show. rage was broken last week. this 
fixes it"
    
    This reverts commit 7bf845b24ca7bd12273f5207022e1e5db4ad2e78.
---
 src/lib/elementary/efl_ui_win.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 6b19306f3a..c81f9a9acf 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -977,8 +977,7 @@ _elm_win_resize_job(void *data)
      }
 
    sd->response++;
-// set to false in _elm_win_pre_render()
-//   sd->req_wh = EINA_FALSE;
+   sd->req_wh = EINA_FALSE;
    evas_object_resize(sd->obj, w, h);
    evas_object_resize(sd->legacy.edje, w, h);
    sd->response--;
@@ -1033,7 +1032,6 @@ _elm_win_pre_render(Ecore_Evas *ee)
         _elm_win_resize_job(sd->obj);
         _elm_win_frame_obj_update(sd, 1);
      }
-   sd->req_wh = EINA_FALSE;
 }
 
 static void
@@ -1552,11 +1550,8 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd, Eina_Bool 
force)
      evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h);
    else
      w = ow, h = oh;
-   if (!sd->req_wh)
-     {
-        if (w && h)
-          TRAP(sd, resize, w, h);
-     }
+   if (w && h)
+     TRAP(sd, resize, w, h);
 }
 
 static void

-- 


Reply via email to