enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm_toolbar: remove code duplication 

Summary:
elm_coords_finger_size_adjust() is called twice.
It might not be intended.

Reviewers: Hermet, Jaehyun, seoz

Reviewed By: seoz

Subscribers: raster, seoz, Hermet

Differential Revision: https://phab.enlightenment.org/D1924
This commit is contained in:
Jee-Yong Um 2015-02-11 16:49:24 +09:00 committed by Daniel Juyung Seo
parent 2310a69dab
commit aead3d5135
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -1176,7 +1176,7 @@ _item_theme_hook(Evas_Object *obj,
double scale,
int icon_size)
{
Evas_Coord mw, mh, minw, minh;
Evas_Coord mw = -1, mh = -1;
Evas_Object *view = VIEW(it);
const char *style;
@ -1258,16 +1258,13 @@ _item_theme_hook(Evas_Object *obj,
}
}
mw = mh = minw = minh = -1;
if (!it->separator && !it->object)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
// If the min size is changed by edje signal in edc,
//the below function should be called before the calculation.
edje_object_message_signal_process(view);
edje_object_size_min_restricted_calc(view, &mw, &mh, mw, mh);
if (!it->separator && !it->object)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
edje_object_size_min_restricted_calc(view, &mw, &mh, mw, mh);
evas_object_size_hint_min_set(view, mw, mh);
}