summaryrefslogtreecommitdiff
path: root/src/lib/elm_toolbar.c
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2015-02-23 08:43:47 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2015-02-23 08:43:47 +0900
commit908f1892437fac0aecc3d2c011626ef6038043e8 (patch)
treec0814c2072c866c1d401ff6271e49af8250945d9 /src/lib/elm_toolbar.c
parent0d9d9b80c9164ffd0396ab92ff25c5778a4dcb41 (diff)
elm: Remove redundant finger size adjustment.
This is a successor of a54da8aab.
Diffstat (limited to 'src/lib/elm_toolbar.c')
-rw-r--r--src/lib/elm_toolbar.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index f3a1f1a89..95fbcf203 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -265,15 +265,12 @@ _items_size_fit(Evas_Object *obj, Evas_Coord *bl, Evas_Coord view)
265 if (!it->separator && !it->object) 265 if (!it->separator && !it->object)
266 elm_coords_finger_size_adjust(1, &mw, 1, &mh); 266 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
267 edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh); 267 edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
268 if (!it->separator && !it->object)
269 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
270 } 268 }
271 else if (!more) 269 else if (!more)
272 { 270 {
273 more = EINA_TRUE; 271 more = EINA_TRUE;
274 elm_coords_finger_size_adjust(1, &mw, 1, &mh); 272 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
275 edje_object_size_min_restricted_calc(sd->VIEW(more_item), &mw, &mh, mw, mh); 273 edje_object_size_min_restricted_calc(sd->VIEW(more_item), &mw, &mh, mw, mh);
276 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
277 } 274 }
278 275
279 if (mw != -1 || mh != -1) 276 if (mw != -1 || mh != -1)
@@ -1449,7 +1446,6 @@ _elm_toolbar_item_label_update(Elm_Toolbar_Item_Data *item)
1449 //the below function should be called before the calculation. 1446 //the below function should be called before the calculation.
1450 edje_object_message_signal_process(VIEW(item)); 1447 edje_object_message_signal_process(VIEW(item));
1451 edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh); 1448 edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);
1452 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
1453 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) 1449 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
1454 { 1450 {
1455 if (sd->vertical) 1451 if (sd->vertical)
@@ -2395,8 +2391,6 @@ _item_new(Evas_Object *obj,
2395 //the below function should be called before the calculation. 2391 //the below function should be called before the calculation.
2396 edje_object_message_signal_process(VIEW(it)); 2392 edje_object_message_signal_process(VIEW(it));
2397 edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh); 2393 edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
2398 if (!it->separator && !it->object)
2399 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
2400 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) 2394 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
2401 { 2395 {
2402 if (sd->vertical) 2396 if (sd->vertical)
@@ -2453,7 +2447,6 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item_Data *item)
2453 //the below function should be called before the calculation. 2447 //the below function should be called before the calculation.
2454 edje_object_message_signal_process(VIEW(item)); 2448 edje_object_message_signal_process(VIEW(item));
2455 edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh); 2449 edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);
2456 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
2457 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) 2450 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
2458 { 2451 {
2459 if (sd->vertical) 2452 if (sd->vertical)