summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJee-Yong Um <conr2d@gmail.com>2015-10-30 04:09:28 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-10-30 07:05:12 +0100
commit4990dd88492de3ce76fc21f1bfa42b345887728f (patch)
tree1a9921a760b4a20e36c2abc6a41946d27ada2ca0
parenta01bd0c078adf03d26badb9fa4ac9d520b86ffc8 (diff)
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 <cedric@osg.samsung.com>
-rw-r--r--src/bin/test_hoversel.c1
-rw-r--r--src/lib/elc_hoversel.c35
-rw-r--r--src/lib/elm_hoversel.eo15
3 files changed, 5 insertions, 46 deletions
diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index 72f7bad86..3e39ad009 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_
181 evas_object_show(hoversel); 181 evas_object_show(hoversel);
182 182
183 hoversel = elm_hoversel_add(win); 183 hoversel = elm_hoversel_add(win);
184 elm_hoversel_scrollable_set(hoversel, EINA_TRUE);
185 elm_hoversel_auto_update_set(hoversel, EINA_TRUE); 184 elm_hoversel_auto_update_set(hoversel, EINA_TRUE);
186 elm_hoversel_hover_parent_set(hoversel, win); 185 elm_hoversel_hover_parent_set(hoversel, win);
187 elm_object_text_set(hoversel, "Some Icons"); 186 elm_object_text_set(hoversel, "Some Icons");
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index a922fbea5..bcf31591f 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -435,23 +435,11 @@ _activate(Evas_Object *obj)
435 eo_event_callback_add(ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item)); 435 eo_event_callback_add(ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item));
436 } 436 }
437 437
438 if (sd->scrollable) 438 _create_scroller(obj, sd);
439 { 439 elm_object_content_set(sd->scr, bx);
440 _create_scroller(obj, sd);
441 elm_object_content_set(sd->scr, bx);
442 440
443 _resizing_eval(obj, sd); 441 _resizing_eval(obj, sd);
444 elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl); 442 elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl);
445 }
446 else
447 {
448 if (sd->horizontal)
449 elm_object_part_content_set(sd->hover, elm_hover_best_content_location_get
450 (sd->hover, ELM_HOVER_AXIS_HORIZONTAL), bx);
451 else
452 elm_object_part_content_set(sd->hover, elm_hover_best_content_location_get
453 (sd->hover, ELM_HOVER_AXIS_VERTICAL), bx);
454 }
455 443
456 eo_do(obj, eo_event_callback_call(ELM_HOVERSEL_EVENT_EXPANDED, NULL)); 444 eo_do(obj, eo_event_callback_call(ELM_HOVERSEL_EVENT_EXPANDED, NULL));
457 evas_object_show(sd->hover); 445 evas_object_show(sd->hover);
@@ -559,8 +547,7 @@ _on_move_resize(void * data,
559{ 547{
560 Elm_Hoversel_Data *sd = data; 548 Elm_Hoversel_Data *sd = data;
561 549
562 if (sd->scrollable) 550 _resizing_eval(obj, sd);
563 _resizing_eval(obj, sd);
564} 551}
565 552
566EOLIAN static void 553EOLIAN static void
@@ -943,18 +930,6 @@ _elm_hoversel_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
943} 930}
944 931
945EOLIAN void 932EOLIAN void
946_elm_hoversel_scrollable_set(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd, Eina_Bool scrollable)
947{
948 sd->scrollable = !!scrollable;
949}
950
951EOLIAN Eina_Bool
952_elm_hoversel_scrollable_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
953{
954 return sd->scrollable;
955}
956
957EOLIAN void
958_elm_hoversel_auto_update_set(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd, Eina_Bool auto_update) 933_elm_hoversel_auto_update_set(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd, Eina_Bool auto_update)
959{ 934{
960 sd->auto_update = !!auto_update; 935 sd->auto_update = !!auto_update;
diff --git a/src/lib/elm_hoversel.eo b/src/lib/elm_hoversel.eo
index 5da60e8c6..caca25a37 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,
42 return: const(list<Elm.Widget_Item *>)*; 42 return: const(list<Elm.Widget_Item *>)*;
43 } 43 }
44 } 44 }
45 @property scrollable {
46 [[Control whether scrolling is enabled.
47
48 This Limit the size of contents and make them scrollable.
49
50 @since 1.16
51 ]]
52 get {
53 }
54 set {
55 }
56 values {
57 scrollable: bool; [[$true if scrollable $false otherwise.]]
58 }
59 }
60 @property auto_update { 45 @property auto_update {
61 [[Update icon and text of hoversel same to those of selected item automatically.]] 46 [[Update icon and text of hoversel same to those of selected item automatically.]]
62 get{ 47 get{