From de77d3aa9949060a98326de1e168e8bf3f031f70 Mon Sep 17 00:00:00 2001 From: Jihyeon Seol Date: Mon, 20 Aug 2012 08:02:47 +0000 Subject: [PATCH] From: Jihyeon Seol Subject: [E-devel] [Patch] elc_multibuttonentry resize patch. Currently, there is a problem in the logic of getting the size in the MBE's box. For each line, the height of the line is calculated according to the biggest item's height and is applied to the box size, but problem occurs when the newly added item's height is larger than the one before. For example, when the entry is located in the front of the last line, the line's height is determined by the entry. When the button is added by the user's input at this state, because button's height is larger than the entry's height I have modified each line to have the equal height. SVN revision: 75453 --- legacy/elementary/ChangeLog | 5 +++++ legacy/elementary/src/lib/elc_multibuttonentry.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index d6cd037fbd..2d7a960850 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -380,3 +380,8 @@ * Patch in incomplete access in: colorselecto, win, diskselector, gengrid, genlist, progressbar, slider, label, entry +2012-08-20 Jihyeon Seol + + * Fix sizing issue in multibutton entry by making all lines + the same height. + diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index 6b4b8a2096..2e61477e19 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -1251,7 +1251,6 @@ _calculate_box_min_size(Evas_Object *box, Evas_Object_Box_Data *priv) { minh += cmaxh; cw = 0; - cmaxh = 0; } cw += ww; if (cmaxh < mnh) cmaxh = mnh; @@ -1292,7 +1291,6 @@ _calculate_item_max_height(Evas_Object *box, Evas_Object_Box_Data *priv, int obj { if (local_index > obj_index) return cmaxh; cw = 0; - cmaxh = 0; } cw += ww; @@ -1374,7 +1372,6 @@ _box_layout_cb(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__ { ch += cmaxh; cw = 0; - cmaxh = 0; } evas_object_move(obj,