sanghyeonlee pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bec54fc870e813ac5d091d34e2374ba01861a877
commit bec54fc870e813ac5d091d34e2374ba01861a877
Author: SangHyeon Lee <sh10233....@samsung.com>
Date: Wed Jan 25 13:11:08 2017 +0900
gengrid : fix mirrored position calculate to apply pan width instead of
object width
the pan object width can be different with object width,
because of padding and bar area, so we should using pan's width
instead of object width for mirrored calculation.
in elementary_test gengrid sample, you can see, when mirrored on,
the alignment is broken before merge this patch.
Signed-off-by: SangHyeon Lee <sh10233....@samsung.com>
---
src/lib/elementary/elm_gengrid.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 4e129a7..651e3a7 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -1675,7 +1675,7 @@ _item_place(Elm_Gen_Item *it,
Evas_Coord cx,
Evas_Coord cy)
{
- Evas_Coord x, y, ox, oy, cvx, cvy, cvw, cvh, iw, ih, ww;
+ Evas_Coord x, y, ox, oy, cvx, cvy, cvw, cvh, iw, ih;
Evas_Coord tch, tcw, alignw = 0, alignh = 0, vw, vh;
Eina_Bool reorder_item_move_forward = EINA_FALSE;
Eina_Bool was_realized, can_resize;
@@ -1852,11 +1852,10 @@ _item_place(Elm_Gen_Item *it,
* pan_x when in RTL
* mode */
{
- evas_object_geometry_get(WIDGET(it), NULL, NULL, &ww, NULL);
if (wsd->horizontal && can_resize)
- x = ww - x - it->item->w - wsd->pan_x - wsd->pan_x + ox + ox;
+ x = vw - x - it->item->w - wsd->pan_x - wsd->pan_x + ox + ox;
else
- x = ww - x - wsd->item_width - wsd->pan_x - wsd->pan_x + ox +
ox;
+ x = vw - x - wsd->item_width - wsd->pan_x - wsd->pan_x + ox +
ox;
}
iw = (wsd->horizontal && can_resize) ? it->item->w : wsd->item_width;
ih = (!wsd->horizontal && can_resize) ? it->item->h : wsd->item_height;
--
