summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-24 13:19:50 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-26 11:42:07 +0100
commit2dacf8a69b58c22263e4060119ccf7a97d12b61d (patch)
tree571b54d8c5340ef35f3f190c2f7ac605e2bfc33d
parent4c44c44e1a46bc05ea812259474cbc8c83659769 (diff)
downloadefl-2dacf8a69b58c22263e4060119ccf7a97d12b61d.tar.gz
efl_ui_scroller: support the complete efl.content API
content_get and content_unset was not added. ref T5719 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D7756
-rw-r--r--src/lib/elementary/efl_ui_scroller.c20
-rw-r--r--src/lib/elementary/efl_ui_scroller.eo3
2 files changed, 22 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 0c750ef301..f81aa83eb4 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -64,6 +64,26 @@ _efl_ui_scroller_efl_content_content_set(Eo *obj,
return EINA_TRUE;
}
+EOLIAN static Efl_Gfx_Entity*
+_efl_ui_scroller_efl_content_content_get(const Eo *obj EINA_UNUSED, Efl_Ui_Scroller_Data *pd)
+{
+ return pd->content;
+}
+
+EOLIAN static Efl_Gfx_Entity*
+_efl_ui_scroller_efl_content_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Scroller_Data *pd)
+{
+ Efl_Gfx_Entity *old_content = pd->content;
+
+ pd->content = NULL;
+ if (pd->smanager)
+ {
+ efl_ui_scrollbar_bar_visibility_update(pd->smanager);
+ }
+
+ return old_content;
+}
+
static void
_efl_ui_scroller_bar_read_and_update(Eo *obj)
{
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index 2beeb7ab41..a6bfb5978d 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -8,7 +8,8 @@ class Efl.Ui.Scroller extends Efl.Ui.Layout implements
Efl.Object.constructor;
Efl.Object.finalize;
Efl.Object.destructor;
- Efl.Content.content { set; }
+ Efl.Content.content { get; set; }
+ Efl.Content.content_unset;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Scrollable_Interactive.match_content { set; }
}