diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-09-13 18:49:03 +0200 |
|---|---|---|
| committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-09-13 18:51:51 +0200 |
| commit | 51265dea6b84a6b6191abc03e89087d710d31883 (patch) | |
| tree | c1607d4431510a87b3b27eac31371fa6443582e2 | |
| parent | c6dd9d2a642018c917ae0799815a44a28a7f3e70 (diff) | |
| download | efl-51265dea6b84a6b6191abc03e89087d710d31883.tar.gz | |
efl_ui/scrollable_content: be more explicit about scrollable_content_get()
Summary:
always return NULL when an internal text object exists to avoid exposing
internal objects; this is an abstraction mechanism which should not be
extended or relied upon
Reviewers: segfaultxavi
Reviewed By: segfaultxavi
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9910
| -rw-r--r-- | src/lib/elementary/efl_ui_widget_scrollable_content.c | 1 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_widget_scrollable_content.eo | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/elementary/efl_ui_widget_scrollable_content.c b/src/lib/elementary/efl_ui_widget_scrollable_content.c index c69f7b073d..299eabbece 100644 --- a/src/lib/elementary/efl_ui_widget_scrollable_content.c +++ b/src/lib/elementary/efl_ui_widget_scrollable_content.c @@ -206,6 +206,7 @@ _efl_ui_widget_scrollable_content_scrollable_content_set(Eo *obj, Efl_Ui_Widget_ EOLIAN static Eo * _efl_ui_widget_scrollable_content_scrollable_content_get(const Eo *obj EINA_UNUSED, Efl_Ui_Widget_Scrollable_Content_Data *pd) { + if (pd->label) return NULL; if (!pd->scroller) return NULL; return efl_content_get(pd->scroller); } diff --git a/src/lib/elementary/efl_ui_widget_scrollable_content.eo b/src/lib/elementary/efl_ui_widget_scrollable_content.eo index ff3e774449..9dba617de1 100644 --- a/src/lib/elementary/efl_ui_widget_scrollable_content.eo +++ b/src/lib/elementary/efl_ui_widget_scrollable_content.eo @@ -43,6 +43,8 @@ mixin @beta Efl.Ui.Widget_Scrollable_Content requires Efl.Object @property scrollable_content { [[This is the content which will be placed in the internal scroller. + If a scrollable text string is set, this will return $NULL. + @since 1.23 ]] set { |