kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "popup: default scrollable option change to TRUE" 

This reverts commit 2ddbc5fc9a.

You cannot change default behaviour of released code!
In this way you make applications behave differently on different
efl version.
This commit is contained in:
Davide Andreoli 2016-05-15 18:56:57 +02:00
parent 21da8f1475
commit d7c9790450
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/bin/elementary/test_popup.c
View File

@ -306,7 +306,8 @@ _popup_center_title_content_3button_cb(void *data, Evas_Object *obj EINA_UNUSED,
char buf[256];
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (is_popup_scroll)
elm_popup_scrollable_set(popup, is_popup_scroll);
// popup title
elm_object_part_text_set(popup, "title,text", "Title");
@ -367,7 +368,8 @@ _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);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (is_popup_scroll)
elm_popup_scrollable_set(popup, is_popup_scroll);
// popup title
elm_object_part_text_set(popup, "title,text", "Title");
@ -439,7 +441,8 @@ _popup_center_title_text_2button_restack_cb(void *data, Evas_Object *obj EINA_UN
Evas_Object *btn, *btn2;
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (is_popup_scroll)
elm_popup_scrollable_set(popup, is_popup_scroll);
evas_object_smart_callback_add(popup, "block,clicked",
_restack_block_clicked_cb, NULL);
@ -483,7 +486,8 @@ _popup_center_text_1button_hide_show_cb(void *data, Evas_Object *obj EINA_UNUSED
}
g_popup = elm_popup_add(data);
elm_popup_scrollable_set(g_popup, is_popup_scroll);
if (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.");
@ -531,7 +535,8 @@ _popup_center_text_3button_add_remove_button_cb(void *data,
int i;
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (is_popup_scroll)
elm_popup_scrollable_set(popup, is_popup_scroll);
// popup title
elm_object_part_text_set(popup, "title,text",
@ -566,7 +571,8 @@ _popup_transparent_cb(void *data, Evas_Object *obj EINA_UNUSED,
Evas_Object *btn;
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (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");
@ -589,7 +595,8 @@ _popup_transparent_align_cb(void *data, Evas_Object *obj EINA_UNUSED,
Evas_Object *btn, *btn1;
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (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");
@ -631,7 +638,8 @@ _popup_center_title_list_content_1button_cb(void *data, Evas_Object *obj EINA_UN
Evas_Object *btn;
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (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
@ -662,7 +670,8 @@ _popup_center_title_genlist_content_1button_cb(void *data, Evas_Object *obj EINA
int i;
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (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();
@ -674,9 +683,7 @@ _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_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_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE);
for (i = 0; i < 10; i++)
@ -711,7 +718,8 @@ _subpopup_cb(void *data, Evas_Object *obj EINA_UNUSED,
Evas_Object *btn, *btnclose;
popup = elm_popup_add(data);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (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");
@ -746,7 +754,8 @@ _popup_content_only_cb(void *data, Evas_Object *obj EINA_UNUSED,
Evas_Object *win = data;
popup = elm_popup_add(win);
elm_popup_scrollable_set(popup, is_popup_scroll);
if (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);
@ -920,9 +929,6 @@ 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);
}

2
src/lib/elementary/elc_popup.c
View File

@ -1552,8 +1552,6 @@ _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