cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=4990dd88492de3ce76fc21f1bfa42b345887728f
commit 4990dd88492de3ce76fc21f1bfa42b345887728f
Author: Jee-Yong Um <con...@gmail.com>
Date: Fri Oct 30 04:09:28 2015 +0100
hoversel: remove scrollable_set/get() API
Summary:
Hoversel scrollability can be considered as default behavior of hoversel.
These APIs are not necessary any more.
Reviewers: cedric, DaveMDS
Subscribers: DaveMDS, cedric
Differential Revision: https://phab.enlightenment.org/D3241
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/bin/test_hoversel.c | 1 -
src/lib/elc_hoversel.c | 35 +++++------------------------------
src/lib/elm_hoversel.eo | 15 ---------------
3 files changed, 5 insertions(+), 46 deletions(-)
diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index 72f7bad..3e39ad0 100644
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -181,7 +181,6 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
evas_object_show(hoversel);
hoversel = elm_hoversel_add(win);
- elm_hoversel_scrollable_set(hoversel, EINA_TRUE);
elm_hoversel_auto_update_set(hoversel, EINA_TRUE);
elm_hoversel_hover_parent_set(hoversel, win);
elm_object_text_set(hoversel, "Some Icons");
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index a922fbe..bcf3159 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -435,23 +435,11 @@ _activate(Evas_Object *obj)
eo_event_callback_add(ELM_WIDGET_EVENT_UNFOCUSED,
_item_unfocused_cb, item));
}
- if (sd->scrollable)
- {
- _create_scroller(obj, sd);
- elm_object_content_set(sd->scr, bx);
+ _create_scroller(obj, sd);
+ elm_object_content_set(sd->scr, bx);
- _resizing_eval(obj, sd);
- elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl);
- }
- else
- {
- if (sd->horizontal)
- elm_object_part_content_set(sd->hover,
elm_hover_best_content_location_get
- (sd->hover,
ELM_HOVER_AXIS_HORIZONTAL), bx);
- else
- elm_object_part_content_set(sd->hover,
elm_hover_best_content_location_get
- (sd->hover, ELM_HOVER_AXIS_VERTICAL),
bx);
- }
+ _resizing_eval(obj, sd);
+ elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl);
eo_do(obj, eo_event_callback_call(ELM_HOVERSEL_EVENT_EXPANDED, NULL));
evas_object_show(sd->hover);
@@ -559,8 +547,7 @@ _on_move_resize(void * data,
{
Elm_Hoversel_Data *sd = data;
- if (sd->scrollable)
- _resizing_eval(obj, sd);
+ _resizing_eval(obj, sd);
}
EOLIAN static void
@@ -943,18 +930,6 @@
_elm_hoversel_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
}
EOLIAN void
-_elm_hoversel_scrollable_set(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd,
Eina_Bool scrollable)
-{
- sd->scrollable = !!scrollable;
-}
-
-EOLIAN Eina_Bool
-_elm_hoversel_scrollable_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
-{
- return sd->scrollable;
-}
-
-EOLIAN void
_elm_hoversel_auto_update_set(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd,
Eina_Bool auto_update)
{
sd->auto_update = !!auto_update;
diff --git a/src/lib/elm_hoversel.eo b/src/lib/elm_hoversel.eo
index 5da60e8..caca25a 100644
--- a/src/lib/elm_hoversel.eo
+++ b/src/lib/elm_hoversel.eo
@@ -42,21 +42,6 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
return: const(list<Elm.Widget_Item *>)*;
}
}
- @property scrollable {
- [[Control whether scrolling is enabled.
-
- This Limit the size of contents and make them scrollable.
-
- @since 1.16
- ]]
- get {
- }
- set {
- }
- values {
- scrollable: bool; [[$true if scrollable $false otherwise.]]
- }
- }
@property auto_update {
[[Update icon and text of hoversel same to those of selected item
automatically.]]
get{
--
