jaehwan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2ddbc5fc9a34ee47bf7e511283ce5d602366907e
commit 2ddbc5fc9a34ee47bf7e511283ce5d602366907e
Author: Jinyong Park <j4939.p...@samsung.com>
Date: Fri May 13 14:49:18 2016 +0900
popup: default scrollable option change to TRUE
Summary:
Usually, popup have a scroll bar when its content is too long to display in
popup's size.
But now, default option is unscrollable.
So change default option and popup's test case.
Reviewers: jaehwan, Hermet, herb
Subscribers: cedric, singh.amitesh, jpeg
Differential Revision: https://phab.enlightenment.org/D3941
---
src/bin/elementary/test_popup.c | 40 +++++++++++++++++-----------------------
src/lib/elementary/elc_popup.c | 2 ++
2 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/bin/elementary/test_popup.c b/src/bin/elementary/test_popup.c
index 3ab08e1..2d85632 100644
--- a/src/bin/elementary/test_popup.c
+++ b/src/bin/elementary/test_popup.c
@@ -306,8 +306,7 @@ _popup_center_title_content_3button_cb(void *data,
Evas_Object *obj EINA_UNUSED,
char buf[256];
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
// popup title
elm_object_part_text_set(popup, "title,text", "Title");
@@ -368,8 +367,7 @@ _popup_center_title_item_3button_cb(void *data, Evas_Object
*obj EINA_UNUSED,
Evas_Object *popup, *icon1, *btn1, *btn2, *btn3;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
// popup title
elm_object_part_text_set(popup, "title,text", "Title");
@@ -441,8 +439,7 @@ _popup_center_title_text_2button_restack_cb(void *data,
Evas_Object *obj EINA_UN
Evas_Object *btn, *btn2;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
evas_object_smart_callback_add(popup, "block,clicked",
_restack_block_clicked_cb, NULL);
@@ -486,8 +483,7 @@ _popup_center_text_1button_hide_show_cb(void *data,
Evas_Object *obj EINA_UNUSED
}
g_popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(g_popup, is_popup_scroll);
+ elm_popup_scrollable_set(g_popup, is_popup_scroll);
elm_object_text_set(g_popup, "Hide this popup by using the button."
"When you click list item again, you can see this
popup.");
@@ -535,8 +531,7 @@ _popup_center_text_3button_add_remove_button_cb(void *data,
int i;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
// popup title
elm_object_part_text_set(popup, "title,text",
@@ -571,8 +566,7 @@ _popup_transparent_cb(void *data, Evas_Object *obj
EINA_UNUSED,
Evas_Object *btn;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_object_style_set(popup, "transparent");
elm_object_text_set(popup, "This Popup has transparent background");
@@ -595,8 +589,7 @@ _popup_transparent_align_cb(void *data, Evas_Object *obj
EINA_UNUSED,
Evas_Object *btn, *btn1;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_object_style_set(popup, "transparent");
elm_object_text_set(popup, "This Popup has transparent background");
@@ -638,8 +631,7 @@ _popup_center_title_list_content_1button_cb(void *data,
Evas_Object *obj EINA_UN
Evas_Object *btn;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_object_part_text_set(popup, "title,text", "Title");
// list as a popup content
@@ -670,8 +662,7 @@ _popup_center_title_genlist_content_1button_cb(void *data,
Evas_Object *obj EINA
int i;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_object_part_text_set(popup, "title,text", "Title");
Elm_Genlist_Item_Class *itc1 = elm_genlist_item_class_new();
@@ -683,7 +674,9 @@ _popup_center_title_genlist_content_1button_cb(void *data,
Evas_Object *obj EINA
// genlist as a popup content
genlist = elm_genlist_add(popup);
- elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+ elm_genlist_mode_set(genlist, ELM_LIST_EXPAND);
+ evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE);
for (i = 0; i < 10; i++)
@@ -718,8 +711,7 @@ _subpopup_cb(void *data, Evas_Object *obj EINA_UNUSED,
Evas_Object *btn, *btnclose;
popup = elm_popup_add(data);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_object_style_set(popup, "subpopup");
elm_object_part_text_set(popup, "title,text", "Title");
@@ -754,8 +746,7 @@ _popup_content_only_cb(void *data, Evas_Object *obj
EINA_UNUSED,
Evas_Object *win = data;
popup = elm_popup_add(win);
- if (is_popup_scroll)
- elm_popup_scrollable_set(popup, is_popup_scroll);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
bx = elm_box_add(popup);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -929,6 +920,9 @@ test_popup(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
evas_object_show(check);
evas_object_smart_callback_add(check, "changed", _popup_scroll_cb, NULL);
+ elm_check_state_set(check, EINA_TRUE);
+ is_popup_scroll = EINA_TRUE;
+
evas_object_resize(win, 480, 400);
evas_object_show(win);
}
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 22777f0..5616d2f 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1552,6 +1552,8 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data
*priv)
_populate_theme_scroll(priv);
_visuals_set(obj);
+
+ elm_popup_scrollable_set(obj, EINA_TRUE);
}
static void
--
