aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/elementary/src/lib/elm_win.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-01-20 18:15:35 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-02-18 18:17:27 +0900
commit09d51174ad7a31e1b58cb4a031e2d60edede7c30 (patch)
tree290b81072a5592af0326d9a963a6b241d89a37cc /legacy/elementary/src/lib/elm_win.c
parentelm_widget: do not set NULL as parent for object (diff)
downloadefl-09d51174ad7a31e1b58cb4a031e2d60edede7c30.tar.gz
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
Diffstat (limited to 'legacy/elementary/src/lib/elm_win.c')
-rw-r--r--legacy/elementary/src/lib/elm_win.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 24041a93d0..fa17423ec6 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/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