From 9150553eac3c52296a096c745df4d0d40a03aa10 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Wed, 7 Jun 2017 15:20:17 +0900 Subject: [PATCH] scroller : Call mirrored_set function after edje_obj is initialized Summary: Problem that scroller is not mirrored in RTL mode has been fixed in D4908. However, I found a problem in init process. I will revert D4908 commit(https://phab.enlightenment.org/D4908). After edje_obj is initialized, mirrored_set is called. When wanted_region_set is called, x-coordinate flip normally and acts as RTL. Test Plan: scroller test on elementary_test. Reviewers: raster, woohyun, SanghyeonLee, akanad, eagleeye, cedric, singh.amitesh, eunue Subscribers: jpeg, cedric Differential Revision: https://phab.enlightenment.org/D4944 --- src/lib/elementary/elm_scroller.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 4cf261c..0da8823 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -904,8 +904,6 @@ _elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv) (obj, "scroller", "base", elm_widget_style_get(obj))) CRI("Failed to set layout!"); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); - priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_smart_member_add(priv->hit_rect, obj); elm_widget_sub_object_add(obj, priv->hit_rect); @@ -923,6 +921,8 @@ _elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv) evas_object_size_hint_min_set(obj, minw, minh); evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, obj); + _mirrored_set(obj, elm_widget_mirrored_get(obj)); + elm_interface_scrollable_edge_left_cb_set(obj, _edge_left_cb); elm_interface_scrollable_edge_right_cb_set(obj, _edge_right_cb); elm_interface_scrollable_edge_top_cb_set(obj, _edge_top_cb); -- 2.7.4