raster pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=79b6edd1a6ad763258337b7aac5bd7799411bb44

commit 79b6edd1a6ad763258337b7aac5bd7799411bb44
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Wed Jan 20 18:15:35 2016 +0900

    elm win: fix excess resize callbacks on windows when not really resizing
    
    this fixes excess callbacks on window (and content) objhects resizing
    down then back up again when windows are forcibly resized like
    fullscreen, maximized and remembered windows.
    
    @fix
---
 src/lib/elm_win.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 24041a9..fa17423 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2083,10 +2083,9 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data 
*sd, Evas_Coord x, Evas_Co
 EOLIAN static void
 _elm_win_evas_object_smart_resize(Eo *obj, Elm_Win_Data *sd, Evas_Coord w, 
Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
-
    if (sd->img_obj)
      {
+        eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
         if (sd->constrain)
           {
              int sw, sh;
@@ -2443,7 +2442,8 @@ _elm_win_resize_objects_eval(Evas_Object *obj)
    if (h < minh) h = minh;
    if (w > maxw) w = maxw;
    if (h > maxh) h = maxh;
-   evas_object_resize(obj, w, h);
+   if (sd->img_obj) evas_object_resize(obj, w, h);
+   else TRAP(sd, resize, w, h);
 }
 
 static void

-- 


Reply via email to