aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:11:01 -0500
commita6566ef8ae94812951a812ea8da2e94fdfe6e611 (patch)
tree0694d17a5af1b85c6e6dfc60071446d317afa19a
parentelm_interface_scrollable: repeat_events -> content_events (diff)
downloadefl-a6566ef8ae94812951a812ea8da2e94fdfe6e611.tar.gz
elm_interface_scrollable: use 'mirrored' from Efl.Ui.Base
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c3
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo9
-rw-r--r--src/lib/elementary/elm_list.c2
-rw-r--r--src/lib/elementary/elm_scroller.c2
8 files changed, 9 insertions, 15 deletions
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 4c3559da96..6604752c6f 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 155aa8df28..c041770f76 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -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
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 114890b969..269aed2bbd 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -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);
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index d78bd57672..5f784adbc3 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -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
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 731065d597..0980802312 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -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.
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index 9f34999347..b1b89348ed 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 {
@@ -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]]
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 7fe5a888e7..4c2770065a 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -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)
{
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 2298ce9948..21cfd04710 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