summaryrefslogtreecommitdiff
path: root/src/lib/elm_toolbar.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elm_toolbar.c')
-rw-r--r--src/lib/elm_toolbar.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 650819349..f3a1f1a89 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1176,7 +1176,7 @@ _item_theme_hook(Evas_Object *obj,
1176 double scale, 1176 double scale,
1177 int icon_size) 1177 int icon_size)
1178{ 1178{
1179 Evas_Coord mw, mh, minw, minh; 1179 Evas_Coord mw = -1, mh = -1;
1180 Evas_Object *view = VIEW(it); 1180 Evas_Object *view = VIEW(it);
1181 const char *style; 1181 const char *style;
1182 1182
@@ -1258,16 +1258,13 @@ _item_theme_hook(Evas_Object *obj,
1258 } 1258 }
1259 } 1259 }
1260 1260
1261 mw = mh = minw = minh = -1;
1262 if (!it->separator && !it->object)
1263 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
1264
1265 // If the min size is changed by edje signal in edc, 1261 // If the min size is changed by edje signal in edc,
1266 //the below function should be called before the calculation. 1262 //the below function should be called before the calculation.
1267 edje_object_message_signal_process(view); 1263 edje_object_message_signal_process(view);
1268 edje_object_size_min_restricted_calc(view, &mw, &mh, mw, mh); 1264
1269 if (!it->separator && !it->object) 1265 if (!it->separator && !it->object)
1270 elm_coords_finger_size_adjust(1, &mw, 1, &mh); 1266 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
1267 edje_object_size_min_restricted_calc(view, &mw, &mh, mw, mh);
1271 evas_object_size_hint_min_set(view, mw, mh); 1268 evas_object_size_hint_min_set(view, mw, mh);
1272} 1269}
1273 1270