From: Mike Blumenkrantz Date: Thu, 15 Feb 2018 02:14:52 +0000 (-0500) Subject: elm_interface_scrollable: use 'mirrored' from Efl.Ui.Base X-Git-Tag: upstream/1.21.0~1930 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84941a978a18f5d21cda9d628b8a29275991ba9e;p=platform%2Fupstream%2Fefl.git elm_interface_scrollable: use 'mirrored' from Efl.Ui.Base Change-Id: Ie70b7df67b5a8c6a501d49a34a19ae5551c36957 --- diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 4c3559d..6604752 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -924,7 +924,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) if (sd->scroll) { - elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj)); + efl_ui_mirrored_set(obj, efl_ui_mirrored_get(obj)); if (sd->single_line) elm_widget_element_update(obj, sd->scr_edje, PART_NAME_SCROLLER); diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 0470986..9c9b5a2 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -1340,7 +1340,7 @@ _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) { Efl_Ui_Theme_Apply ok = EFL_UI_THEME_APPLY_FAILED; - elm_interface_scrollable_mirrored_set(obj, efl_ui_mirrored_get(obj)); + efl_ui_mirrored_set(obj, efl_ui_mirrored_get(obj)); if (sd->single_line) ok = elm_widget_theme_object_set diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index bf18d9c..50815ce 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -3689,7 +3689,7 @@ _mirrored_set(Evas_Object *obj, ELM_GENGRID_DATA_GET(obj, sd); _item_cache_zero(sd); - elm_interface_scrollable_mirrored_set(efl_super(obj, MY_CLASS), rtl); + efl_ui_mirrored_set(efl_super(obj, MY_CLASS), rtl); if (!sd->items) return; it = ELM_GEN_ITEM_FROM_INLIST(sd->items); diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 7205eab..af39872 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -3567,7 +3567,7 @@ _mirrored_set(Evas_Object *obj, ELM_GENLIST_DATA_GET(obj, sd); _item_cache_zero(sd); - elm_interface_scrollable_mirrored_set(obj, rtl); + efl_ui_mirrored_set(obj, rtl); } EOLIAN static Efl_Ui_Theme_Apply diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 7de5f6f..cb3559e 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -1940,7 +1940,7 @@ _elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Scrollable_Smart_Interfac } EOLIAN static void -_elm_interface_scrollable_mirrored_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool mirrored) +_elm_interface_scrollable_efl_ui_base_mirrored_set(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool mirrored) { Evas_Coord wx; @@ -1959,6 +1959,7 @@ _elm_interface_scrollable_mirrored_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart // elm_interface_scrollable_content_pos_set(sid->obj, wx, sid->wy, EINA_FALSE); + efl_ui_mirrored_set(efl_super(obj, ELM_INTERFACE_SCROLLABLE_MIXIN), mirrored); } /* returns TRUE when we need to move the scroller, FALSE otherwise. diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo index 5d145b6..c6a1488 100644 --- a/src/lib/elementary/elm_interface_scrollable.eo +++ b/src/lib/elementary/elm_interface_scrollable.eo @@ -432,14 +432,6 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub, Efl. animate_stop_cb: Elm_Interface_Scrollable_Cb @nullable; [[The callback]] } } - @property mirrored { - [[Mirroed property]] - set { - } - values { - mirrored: bool; [[$true if mirrored, $false otherwise]] - } - } @property content_min_limit_cb { [[set the callback to run on minimal limit content]] set { @@ -686,6 +678,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub, Efl. Efl.Object.constructor; Efl.Ui.Focus.Manager.border_elements { get; } Efl.Ui.Widget.focus_manager_create; + Efl.Ui.Base.mirrored { set; } } events { changed; [[Called when content changed]] diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index da59748..24b472f 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -1074,7 +1074,7 @@ _mirrored_set(Evas_Object *obj, ELM_LIST_DATA_GET(obj, sd); - elm_interface_scrollable_mirrored_set(obj, rtl); + efl_ui_mirrored_set(obj, rtl); EINA_LIST_FOREACH(sd->items, n, eo_it) { diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 635f709..09424d5 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -384,7 +384,7 @@ static void _mirrored_set(Evas_Object *obj, Eina_Bool mirrored) { - elm_interface_scrollable_mirrored_set(obj, mirrored); + efl_ui_mirrored_set(obj, mirrored); } EOLIAN static Efl_Ui_Theme_Apply diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 48ec9fa..30389c4 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -280,7 +280,7 @@ _mirrored_set(Evas_Object *obj, ELM_TOOLBAR_DATA_GET(obj, sd); /* TIZEN_ONLY(20170214): Added for mirroring of navigationbar */ - elm_interface_scrollable_mirrored_set(obj, mirrored); + efl_ui_mirrored_set(obj, mirrored); /* END */ EINA_INLIST_FOREACH(sd->items, it) diff --git a/src/lib/elementary_tizen/elm_genlist.c b/src/lib/elementary_tizen/elm_genlist.c index b88d016..42e137d 100644 --- a/src/lib/elementary_tizen/elm_genlist.c +++ b/src/lib/elementary_tizen/elm_genlist.c @@ -4575,7 +4575,7 @@ static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl) { - elm_interface_scrollable_mirrored_set(obj, rtl); + efl_ui_mirrored_set(obj, rtl); } EOLIAN static Efl_Ui_Theme_Apply