From 7812ce77fe7fe328cea9a7805641330adb5aafae Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Wed, 25 Jun 2014 11:27:08 +0900 Subject: [PATCH] Toolbar: Fixed wrong toolbar resize logic Summary: When toolbar use ELM_TOOLBAR_SHRINK_SCROLL and toolbar viewport size is decreased rapidly, toolbar box size is not changed. Test Plan: elementary_test -> toolbar 2 increase window size -> decrease window size(presto) -> toolbar size is wrong Reviewers: seoz, woohyun, jaehwan, Hermet, raster Reviewed By: seoz Differential Revision: https://phab.enlightenment.org/D1081 --- legacy/elementary/src/lib/elm_toolbar.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index de4f7e1..55ec9f8 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -537,13 +537,9 @@ _resize_job(void *data) else { if (sd->vertical) - { - if ((vh >= mh) && (h != vh)) h = vh; - } + h = (vh >= mh) ? vh : mh; else - { - if ((vw >= mw) && (w != vw)) w = vw; - } + w = (vw >= mw) ? vw : mw; EINA_INLIST_FOREACH(sd->items, it) { if (it->selected) -- 2.7.4