From 990afa25c34c0dda472d6f41117c2e77861b1b75 Mon Sep 17 00:00:00 2001 From: Wonki Kim Date: Tue, 7 Feb 2017 15:03:45 -0800 Subject: [PATCH] elm_scroller: keep contents layout rel even if rtl is set Summary: Once rtl mode is set, elm_layout reverses its x-axis. however, scroller uses elm_layout to contain both original content and proxy image of it when loop mode is set. In this situation, elm_layout should not reverse its x-axis when It is used for container of proxy to support loop mode of scroller. This commit will not apply rtl mode to contents layout (mirrored set) Test Plan: * Check that there is a proxy image over right edge of original content. 1. Run elementary_test 2. Open scroller 3. Switch UI_mirrored mode on 4. Test (Control with keyboard / mouse wheel control looks bad on rtl mod) a. go to the right edge with keyboard b. get over the edge Reviewers: woohyun, z-wony, jpeg, cedric Differential Revision: https://phab.enlightenment.org/D4568 Signed-off-by: Cedric BAIL --- src/lib/elementary/elm_scroller.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 0f74ee1fef..bd30cb41cb 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -777,6 +777,9 @@ _loop_content_set(Evas_Object *obj, Elm_Scroller_Data *sd, Evas_Object *content) elm_widget_sub_object_add(obj, sd->contents); elm_widget_on_show_region_hook_set(sd->contents, _show_region_hook, obj); + + elm_widget_mirrored_automatic_set(sd->contents, EINA_FALSE); + elm_widget_mirrored_set(sd->contents, EINA_FALSE); } elm_object_part_content_set(sd->contents, "elm.swallow.content", content); sd->content = content;