elm_interface_scrollable: use 'mirrored' from Efl.Ui.Base

This commit is contained in:
Mike Blumenkrantz 2018-02-14 21:14:52 -05:00
parent f13682a5df
commit a6566ef8ae
8 changed files with 9 additions and 15 deletions

View File

@ -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);

View File

@ -949,7 +949,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

View File

@ -3553,7 +3553,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);

View File

@ -3436,7 +3436,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

View File

@ -1673,7 +1673,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;
@ -1693,6 +1693,7 @@ _elm_interface_scrollable_mirrored_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart
wx = sid->wx;
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.

View File

@ -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 {
@ -670,6 +662,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]]

View File

@ -1062,7 +1062,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)
{

View File

@ -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