projects
/
profile
/
ivi
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
730585e
)
Make sure not exceed evas geometry size before hint size setting.
65/3265/1
accepted/2.0/20130402.211926
submit/2.0/20130402.130250
author
Wang Quanxian
<quanxian.wang@intel.com>
Tue, 2 Apr 2013 12:55:53 +0000
(20:55 +0800)
committer
Wang Quanxian
<quanxian.wang@intel.com>
Tue, 2 Apr 2013 12:57:41 +0000
(20:57 +0800)
Signed-Off-By Quanxian Wang <quanxian.wang@intel.com>
src/lib/elm_layout.c
patch
|
blob
|
history
diff --git
a/src/lib/elm_layout.c
b/src/lib/elm_layout.c
index
ddce6c3
..
49a6f2d
100644
(file)
--- a/
src/lib/elm_layout.c
+++ b/
src/lib/elm_layout.c
@@
-125,8
+125,12
@@
static void
_sizing_eval(Evas_Object *obj, Elm_Layout_Smart_Data *sd)
{
Evas_Coord minw = -1, minh = -1;
+ int w, h = 0;
edje_object_size_min_calc(ELM_WIDGET_DATA(sd)->resize_obj, &minw, &minh);
+ evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+ if (minh > h ) minh = h;
+ if (minw > w ) minw = w;
evas_object_size_hint_min_set(obj, minw, minh);
evas_object_size_hint_max_set(obj, -1, -1);
}