forked from enlightenment/efl
elementary/mapbuf - Fix the mapbuf to resize the contents(smart obj) correctly.
When smart obj was set as the contents the _configure would be called recursively. In this process the lastest size could be reverted as the previous one. SVN revision: 74064
This commit is contained in:
parent
d64db308c7
commit
64eaac722b
|
@ -322,3 +322,9 @@
|
||||||
|
|
||||||
* Small fix to account for framespace that is used in wayland
|
* Small fix to account for framespace that is used in wayland
|
||||||
(0 in x11 so shouldnt affect x11).
|
(0 in x11 so shouldnt affect x11).
|
||||||
|
|
||||||
|
2012-07-18 Hermet (ChunEon Park)
|
||||||
|
|
||||||
|
* Fix the mapbuf to resize the contents(smart obj) correctly. When smart obj was
|
||||||
|
set as the contents the _configure would be called recursively. In this process
|
||||||
|
the lastest size could be reverted as the previous one.
|
|
@ -113,6 +113,8 @@ _mapbuf(Evas_Object *obj)
|
||||||
ELM_MAPBUF_DATA_GET(obj, sd);
|
ELM_MAPBUF_DATA_GET(obj, sd);
|
||||||
|
|
||||||
evas_object_geometry_get(ELM_WIDGET_DATA(sd)->resize_obj, &x, &y, &w, &h);
|
evas_object_geometry_get(ELM_WIDGET_DATA(sd)->resize_obj, &x, &y, &w, &h);
|
||||||
|
evas_object_resize(sd->content, w, h);
|
||||||
|
|
||||||
if (sd->enabled)
|
if (sd->enabled)
|
||||||
{
|
{
|
||||||
Evas_Map *m;
|
Evas_Map *m;
|
||||||
|
@ -130,7 +132,6 @@ _mapbuf(Evas_Object *obj)
|
||||||
evas_object_map_set(sd->content, NULL);
|
evas_object_map_set(sd->content, NULL);
|
||||||
evas_object_map_enable_set(sd->content, EINA_FALSE);
|
evas_object_map_enable_set(sd->content, EINA_FALSE);
|
||||||
evas_object_move(sd->content, x, y);
|
evas_object_move(sd->content, x, y);
|
||||||
evas_object_resize(sd->content, w, h);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,7 +161,6 @@ _configure(Evas_Object *obj)
|
||||||
evas_nochange_pop(e);
|
evas_nochange_pop(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
evas_object_resize(sd->content, w, h);
|
|
||||||
_mapbuf(obj);
|
_mapbuf(obj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue