projects
/
framework
/
uifw
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
f8e6e1e
)
Sorry, Fix build conflict.
author
jaehwan
<jaehwan@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 25 Jun 2012 08:50:11 +0000
(08:50 +0000)
committer
Jaehwan Kim
<jae.hwan.kim@samsung.com>
Fri, 29 Jun 2012 06:20:15 +0000
(15:20 +0900)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@72792
7cbeb6ba
-43b4-40fd-8cce-
4c39aea84d33
Conflicts:
src/lib/elm_toolbar.c
src/lib/elm_toolbar.c
patch
|
blob
|
history
diff --git
a/src/lib/elm_toolbar.c
b/src/lib/elm_toolbar.c
index
3b9f4bc
..
d0dc537
100644
(file)
--- a/
src/lib/elm_toolbar.c
+++ b/
src/lib/elm_toolbar.c
@@
-1322,7
+1322,7
@@
_item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
}
- mw = mh =
minw = minh =
-1;
+ mw = mh = -1;
if (!it->separator && !it->object)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);