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:
a549a95
)
Revert the commit 'make sure not exceed evas geometry size before hint size setting.'
68/3268/1
accepted/2.0/20130408.232215
submit/2.0/20130408.231802
author
Wang Quanxian
<quanxian.wang@intel.com>
Wed, 3 Apr 2013 05:50:03 +0000
(13:50 +0800)
committer
Wang Quanxian
<quanxian.wang@intel.com>
Wed, 3 Apr 2013 05:50:39 +0000
(13:50 +0800)
From QA testing, it will bring more side effect on layout for text.
src/lib/elm_layout.c
patch
|
blob
|
history
diff --git
a/src/lib/elm_layout.c
b/src/lib/elm_layout.c
index
49a6f2d
..
ddce6c3
100644
(file)
--- a/
src/lib/elm_layout.c
+++ b/
src/lib/elm_layout.c
@@
-125,12
+125,8
@@
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);
}