From: Enlightenment S. <no-...@en...> - 2011-07-16 14:45:48
|
Log: elm_config gains a new feature: multitheme selection! themes are added in the order of selection, so to use an overlay for a theme you would select the "base" theme first, then the "overlay" part. then just click use theme and zooooooooooooooooooon Author: discomfitor Date: 2011-07-16 07:45:41 -0700 (Sat, 16 Jul 2011) New Revision: 61426 Trac: http://trac.enlightenment.org/e/changeset/61426 Modified: trunk/elementary/src/bin/config.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-07-16 14:27:33 UTC (rev 61425) +++ trunk/elementary/src/bin/config.c 2011-07-16 14:45:41 UTC (rev 61426) @@ -17,7 +17,7 @@ Eina_Bool in_search_path; }; -static Theme *tsel = NULL; +static const Eina_List *tsel = NULL; static Eina_List *themes = NULL; struct _Elm_Text_Class_Data @@ -1063,28 +1063,13 @@ void *event_info __UNUSED__) { const char *defth; - char *newth; - Theme *t = tsel; + Elm_Theme *th; + Evas_Object *win = elm_object_top_widget_get(obj); + Evas_Object *sample = evas_object_data_get(win, "theme_preview"); - if (!t) return; - defth = elm_theme_get(NULL); - newth = malloc(strlen(defth) + 1 + strlen(t->name) + 1); - if (newth) - { - char *rest; - - newth[0] = 0; - rest = strchr(defth, ':'); - if (!rest) - strcpy(newth, t->name); - else - { - strcpy(newth, t->name); - strcat(newth, rest); - } - elm_theme_all_set(newth); - free(newth); - } + th = elm_object_theme_get(sample); + defth = elm_theme_get(th); + elm_theme_all_set(defth); } static void @@ -1095,30 +1080,33 @@ Theme *t = data; Evas_Object *win = elm_object_top_widget_get(obj); Evas_Object *sample = evas_object_data_get(win, "theme_preview"); - Elm_Theme *th; - const char *defth; - char *newth; + Elm_Theme *th, *sth; + const char *defth, *rest; + Eina_Strbuf *newth; - tsel = t; - defth = elm_theme_get(NULL); - newth = malloc(strlen(defth) + 1 + strlen(t->name) + 1); + tsel = elm_list_selected_items_get(obj); + sth = elm_object_theme_get(sample); + defth = elm_theme_get(sth); + newth = eina_strbuf_new(); + EINA_SAFETY_ON_NULL_RETURN(newth); th = elm_theme_new(); - if (newth) + if (!th) { - char *rest; - - newth[0] = 0; + eina_strbuf_free(newth); + return; + } + if (eina_list_count(tsel) > 1) + eina_strbuf_append_printf(newth, "%s:%s", t->name, defth); + else + { rest = strchr(defth, ':'); if (!rest) - strcpy(newth, t->name); + eina_strbuf_append(newth, t->name); else - { - strcpy(newth, t->name); - strcat(newth, rest); - } - elm_theme_set(th, newth); - free(newth); + eina_strbuf_append_printf(newth, "%s%s", t->name, rest); } + elm_theme_set(th, eina_strbuf_string_get(newth)); + eina_strbuf_free(newth); elm_object_theme_set(sample, th); elm_theme_free(th); } @@ -1303,6 +1291,7 @@ evas_object_show(pd); li = elm_list_add(win); + elm_list_multi_select_set(li, EINA_TRUE); evas_object_size_hint_weight_set(li, 1.0, 1.0); evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_frame_content_set(pd, li); |
From: Enlightenment S. <no-...@en...> - 2011-07-18 06:51:55
|
Log: more elm_config features! theme list will now autoselect your current theme(s) on load. it might even select them correctly! overlay themes sometimes don't get applied to the sample for some reason, but they will still be applied when 'use theme' is clicked Author: discomfitor Date: 2011-07-17 23:51:45 -0700 (Sun, 17 Jul 2011) New Revision: 61466 Trac: http://trac.enlightenment.org/e/changeset/61466 Modified: trunk/elementary/src/bin/config.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-07-18 06:24:34 UTC (rev 61465) +++ trunk/elementary/src/bin/config.c 2011-07-18 06:51:45 UTC (rev 61466) @@ -1073,17 +1073,19 @@ } static void -_theme_sel(void *data, +_theme_sel(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { - Theme *t = data; Evas_Object *win = elm_object_top_widget_get(obj); Evas_Object *sample = evas_object_data_get(win, "theme_preview"); Elm_Theme *th, *sth; - const char *defth, *rest; + Elm_List_Item *it; + const char *defth; Eina_Strbuf *newth; + Eina_List *l; + if (!sample) return; tsel = elm_list_selected_items_get(obj); sth = elm_object_theme_get(sample); defth = elm_theme_get(sth); @@ -1095,15 +1097,13 @@ eina_strbuf_free(newth); return; } - if (eina_list_count(tsel) > 1) - eina_strbuf_append_printf(newth, "%s:%s", t->name, defth); - else + EINA_LIST_REVERSE_FOREACH((Eina_List*)tsel, l, it) { - rest = strchr(defth, ':'); - if (!rest) - eina_strbuf_append(newth, t->name); - else - eina_strbuf_append_printf(newth, "%s%s", t->name, rest); + Theme *t = elm_list_item_data_get(it); + eina_strbuf_append_printf(newth, "%s:", t->name); + if ((!l->prev) && strcmp(t->name, "default")) + /* ensure default theme is always there for fallback */ + eina_strbuf_append(newth, "default"); } elm_theme_set(th, eina_strbuf_string_get(newth)); eina_strbuf_free(newth); @@ -1266,6 +1266,10 @@ Evas_Object *tb, *rc, *sc, *sp, *li, *pd, *fr, *bt, *sample; Eina_List *list, *l; char *th, *s, *ext; + Elm_Theme *d; + Elm_List_Item *it, *def_it; + const char *theme_name, *sep[20]; + unsigned int x; tb = elm_table_add(win); evas_object_size_hint_weight_set(tb, 1.0, 1.0); @@ -1298,10 +1302,18 @@ evas_object_show(li); list = elm_theme_name_available_list_new(); + d = elm_theme_default_get(); + theme_name = elm_theme_get(d); + for (x = 1, sep[0] = theme_name; x < sizeof(sep) / sizeof(sep[0]); x++) + { + sep[x] = strchr(sep[x - 1] + 1, ':'); + if (!sep[x]) break; + } EINA_LIST_FOREACH(list, l, th) { Theme *t; - + int y; + t = calloc(1, sizeof(Theme)); t->name = eina_stringshare_add(th); s = elm_theme_list_item_path_get(th, &(t->in_search_path)); @@ -1337,8 +1349,23 @@ t->label = eina_stringshare_add(s); } themes = eina_list_append(themes, t); - elm_list_item_append(li, t->label, NULL, NULL, _theme_sel, t); + it = elm_list_item_append(li, t->label, NULL, NULL, NULL, t); + if (!strcmp(t->name, "default")) def_it = it; + for (y = x - 1 /* ignore default e theme */; y > 0; y--) + { + const char *start = (sep[y - 1][0] == ':') ? sep[y - 1] + 1 : sep[y - 1]; + unsigned int len = (unsigned int)(sep[y] - start); + if (strncmp(start , t->name, len) || (strlen(t->name) != len)) continue; + + if (!elm_list_item_selected_get(it)) + elm_list_item_selected_set(it, EINA_TRUE); + break; + } } + if (!elm_list_selected_items_get(li)) + elm_list_item_selected_set(def_it, EINA_TRUE); + evas_object_smart_callback_add(li, "selected", _theme_sel, NULL); + evas_object_smart_callback_add(li, "unselected", _theme_sel, NULL); elm_theme_name_available_list_free(list); elm_list_go(li); |
From: Enlightenment S. <no-...@en...> - 2011-07-23 18:31:50
|
Log: added another test for "big" tooltips, showcases obvious bug where tooltip is cut off when it is larger than the window's canvas Author: discomfitor Date: 2011-07-23 11:24:12 -0700 (Sat, 23 Jul 2011) New Revision: 61617 Trac: http://trac.enlightenment.org/e/changeset/61617 Modified: trunk/elementary/src/bin/test_tooltip.c Modified: trunk/elementary/src/bin/test_tooltip.c =================================================================== --- trunk/elementary/src/bin/test_tooltip.c 2011-07-23 18:10:11 UTC (rev 61616) +++ trunk/elementary/src/bin/test_tooltip.c 2011-07-23 18:24:12 UTC (rev 61617) @@ -121,6 +121,19 @@ return ic; } +static Evas_Object * +_tt_item_icon2(void *data __UNUSED__, + Evas_Object *obj, + void *item __UNUSED__) +{ + Evas_Object *ic = elm_icon_add(obj); + char buf[PATH_MAX]; + snprintf(buf, sizeof(buf), "%s/images/logo.png", PACKAGE_DATA_DIR); + elm_icon_file_set(ic, buf, NULL); + elm_icon_scale_set(ic, 0, 0); + return ic; +} + static void _tt_item_icon_del(void *data, Evas_Object *obj __UNUSED__, @@ -432,6 +445,8 @@ elm_list_item_tooltip_text_set(li, "Something useful here?"); li = elm_list_item_append(lst, "Icon Tooltip", NULL, NULL, NULL, NULL); elm_list_item_tooltip_content_cb_set(li, _tt_item_icon, NULL, NULL); + li = elm_list_item_append(lst, "Big Icon Tooltip", NULL, NULL, NULL, NULL); + elm_list_item_tooltip_content_cb_set(li, _tt_item_icon2, NULL, NULL); evas_object_size_hint_weight_set(lst, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(lst, EVAS_HINT_FILL, EVAS_HINT_FILL); |
From: Enlightenment S. <no-...@en...> - 2011-07-27 06:42:02
|
Log: set transparent style for tooltip tests Author: discomfitor Date: 2011-07-26 23:41:56 -0700 (Tue, 26 Jul 2011) New Revision: 61790 Trac: http://trac.enlightenment.org/e/changeset/61790 Modified: trunk/elementary/src/bin/test_tooltip.c Modified: trunk/elementary/src/bin/test_tooltip.c =================================================================== --- trunk/elementary/src/bin/test_tooltip.c 2011-07-27 05:59:01 UTC (rev 61789) +++ trunk/elementary/src/bin/test_tooltip.c 2011-07-27 06:41:56 UTC (rev 61790) @@ -465,9 +465,11 @@ elm_list_item_tooltip_content_cb_set(li, _tt_item_icon, NULL, NULL); li = elm_list_item_append(lst, "Big Icon Tooltip", NULL, NULL, NULL, NULL); elm_list_item_tooltip_content_cb_set(li, _tt_item_icon2, NULL, NULL); + elm_list_item_tooltip_style_set(li, "transparent"); elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE); li = elm_list_item_append(lst, "Insanely Big Icon Tooltip", NULL, NULL, NULL, NULL); elm_list_item_tooltip_content_cb_set(li, _tt_item_icon3, NULL, NULL); + elm_list_item_tooltip_style_set(li, "transparent"); elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE); evas_object_size_hint_weight_set(lst, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
From: Enlightenment S. <no-...@en...> - 2011-08-01 00:49:53
|
Log: change one of the tooltip tests to exhibit a pretty hilarious tooltip-related label bug Author: discomfitor Date: 2011-07-31 17:49:46 -0700 (Sun, 31 Jul 2011) New Revision: 61930 Trac: http://trac.enlightenment.org/e/changeset/61930 Modified: trunk/elementary/src/bin/test_tooltip.c Modified: trunk/elementary/src/bin/test_tooltip.c =================================================================== --- trunk/elementary/src/bin/test_tooltip.c 2011-07-31 20:29:19 UTC (rev 61929) +++ trunk/elementary/src/bin/test_tooltip.c 2011-08-01 00:49:46 UTC (rev 61930) @@ -150,6 +150,21 @@ return ic; } +static Evas_Object * +_tt_item_label(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + Evas_Object *tt, + void *item __UNUSED__) +{ + Evas_Object *l = elm_label_add(tt); + elm_object_text_set(l, "Something useful here?<ps>" + "No probably not, but this is a super long label<ps>" + "which probably breaks on your system, now doesn't it?<ps>" + "Yeah, I thought so."); + elm_label_line_wrap_set(l, ELM_WRAP_MIXED); + return l; +} + static void _tt_item_icon_del(void *data, Evas_Object *obj __UNUSED__, @@ -460,7 +475,8 @@ lst = elm_list_add(win); li = elm_list_item_append(lst, "Hello", NULL, NULL, NULL, NULL); - elm_list_item_tooltip_text_set(li, "Something useful here?"); + elm_list_item_tooltip_content_cb_set(li, _tt_item_label, NULL, NULL); + elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE); li = elm_list_item_append(lst, "Icon Tooltip", NULL, NULL, NULL, NULL); elm_list_item_tooltip_content_cb_set(li, _tt_item_icon, NULL, NULL); li = elm_list_item_append(lst, "Big Icon Tooltip", NULL, NULL, NULL, NULL); |
From: Enlightenment S. <no-...@en...> - 2011-09-30 03:44:53
|
Log: yeah, using vague numbers instead of clearly named enum values! best choice! no wait...that's the OPPOSITE of the best choice. Author: discomfitor Date: 2011-09-29 20:44:46 -0700 (Thu, 29 Sep 2011) New Revision: 63706 Trac: http://trac.enlightenment.org/e/changeset/63706 Modified: trunk/elementary/src/bin/test_fileselector_button.c trunk/elementary/src/bin/test_fileselector_entry.c trunk/elementary/src/bin/test_flip.c trunk/elementary/src/bin/test_genlist.c trunk/elementary/src/bin/test_label.c trunk/elementary/src/bin/test_spinner.c trunk/elementary/src/bin/test_weather.c Modified: trunk/elementary/src/bin/test_fileselector_button.c =================================================================== --- trunk/elementary/src/bin/test_fileselector_button.c 2011-09-30 03:29:03 UTC (rev 63705) +++ trunk/elementary/src/bin/test_fileselector_button.c 2011-09-30 03:44:46 UTC (rev 63706) @@ -134,7 +134,7 @@ evas_object_show(lb); en = elm_entry_add(win); - elm_entry_line_wrap_set(en, EINA_FALSE); + elm_entry_line_wrap_set(en, ELM_WRAP_NONE); elm_entry_editable_set(en, EINA_FALSE); evas_object_smart_callback_add(fs_bt, "file,chosen", _file_chosen, en); elm_box_pack_end(vbox, en); Modified: trunk/elementary/src/bin/test_fileselector_entry.c =================================================================== --- trunk/elementary/src/bin/test_fileselector_entry.c 2011-09-30 03:29:03 UTC (rev 63705) +++ trunk/elementary/src/bin/test_fileselector_entry.c 2011-09-30 03:44:46 UTC (rev 63706) @@ -146,7 +146,7 @@ evas_object_show(bt); en = elm_entry_add(win); - elm_entry_line_wrap_set(en, EINA_FALSE); + elm_entry_line_wrap_set(en, ELM_WRAP_NONE); elm_entry_editable_set(en, EINA_FALSE); evas_object_smart_callback_add(fs_en, "file,chosen", _file_chosen, en); elm_box_pack_end(vbox, en); Modified: trunk/elementary/src/bin/test_flip.c =================================================================== --- trunk/elementary/src/bin/test_flip.c 2011-09-30 03:29:03 UTC (rev 63705) +++ trunk/elementary/src/bin/test_flip.c 2011-09-30 03:44:46 UTC (rev 63706) @@ -272,7 +272,7 @@ en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); - elm_entry_line_wrap_set(en, EINA_FALSE); + elm_entry_line_wrap_set(en, ELM_WRAP_NONE); snprintf(buf, sizeof(buf), "This is an entry widget in this window that<br>" "uses markup <b>like this</> for styling and<br>" Modified: trunk/elementary/src/bin/test_genlist.c =================================================================== --- trunk/elementary/src/bin/test_genlist.c 2011-09-30 03:29:03 UTC (rev 63705) +++ trunk/elementary/src/bin/test_genlist.c 2011-09-30 03:44:46 UTC (rev 63706) @@ -677,7 +677,7 @@ Evas_Object *lb; lb = elm_label_add(obj); - elm_label_line_wrap_set(lb, 1); + elm_label_line_wrap_set(lb, ELM_WRAP_CHAR); elm_label_wrap_width_set(lb, 201); elm_object_text_set(lb, "ashj ascjscjh n asjkl hcjlh ls hzshnn zjh sh zxjcjsnd h dfw sdv edev efe fwefvv vsd cvs ws wf fvwf wd fwe f we wef we wfe rfwewef wfv wswf wefg sdfws w wsdcfwcf wsc vdv sdsd sdcd cv wsc sdcv wsc d sdcdcsd sdcdsc wdvd sdcsd wscxcv wssvd sd"); return lb; Modified: trunk/elementary/src/bin/test_label.c =================================================================== --- trunk/elementary/src/bin/test_label.c 2011-09-30 03:29:03 UTC (rev 63705) +++ trunk/elementary/src/bin/test_label.c 2011-09-30 03:44:46 UTC (rev 63706) @@ -44,7 +44,7 @@ evas_object_show(lb); lb = elm_label_add(win); - elm_label_line_wrap_set(lb, 1); + elm_label_line_wrap_set(lb, ELM_WRAP_CHAR); elm_object_text_set(lb, "<b>" "This is more text designed to line-wrap here as " Modified: trunk/elementary/src/bin/test_spinner.c =================================================================== --- trunk/elementary/src/bin/test_spinner.c 2011-09-30 03:29:03 UTC (rev 63705) +++ trunk/elementary/src/bin/test_spinner.c 2011-09-30 03:44:46 UTC (rev 63706) @@ -25,7 +25,7 @@ sp = elm_spinner_add(win); elm_spinner_label_format_set(sp, "%1.1f units"); elm_spinner_step_set(sp, 1.3); - elm_spinner_wrap_set(sp, 1); + elm_spinner_wrap_set(sp, ELM_WRAP_CHAR); elm_spinner_min_max_set(sp, -50.0, 250.0); evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -35,7 +35,7 @@ sp = elm_spinner_add(win); elm_spinner_label_format_set(sp, "Percentage %%%1.2f something"); elm_spinner_step_set(sp, 5.0); - elm_spinner_wrap_set(sp, 1); + elm_spinner_wrap_set(sp, ELM_WRAP_CHAR); elm_spinner_min_max_set(sp, 0.0, 100.0); evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -45,7 +45,7 @@ sp = elm_spinner_add(win); elm_spinner_label_format_set(sp, "%1.1f units"); elm_spinner_step_set(sp, 1.3); - elm_spinner_wrap_set(sp, 1); + elm_spinner_wrap_set(sp, ELM_WRAP_CHAR); elm_object_style_set (sp, "vertical"); elm_spinner_min_max_set(sp, -50.0, 250.0); evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); Modified: trunk/elementary/src/bin/test_weather.c =================================================================== --- trunk/elementary/src/bin/test_weather.c 2011-09-30 03:29:03 UTC (rev 63705) +++ trunk/elementary/src/bin/test_weather.c 2011-09-30 03:44:46 UTC (rev 63706) @@ -145,7 +145,7 @@ elm_hoversel_item_add(hv, eweather_plugin_name_get(eweather, i), NULL, ELM_ICON_NONE, _hover_select_cb, NULL); en = elm_entry_add(win); - elm_entry_line_wrap_set(en, 0); + elm_entry_line_wrap_set(en, ELM_WRAP_NONE); elm_entry_single_line_set(en, EINA_TRUE); elm_entry_entry_set(en, "Paris"); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
From: Enlightenment S. <no-...@en...> - 2011-10-21 02:43:15
|
Log: fix compile with latest changes Author: discomfitor Date: 2011-10-20 19:43:08 -0700 (Thu, 20 Oct 2011) New Revision: 64224 Trac: http://trac.enlightenment.org/e/changeset/64224 Modified: trunk/elementary/src/bin/test_genlist.c trunk/elementary/src/bin/test_store.c Modified: trunk/elementary/src/bin/test_genlist.c =================================================================== --- trunk/elementary/src/bin/test_genlist.c 2011-10-21 01:50:34 UTC (rev 64223) +++ trunk/elementary/src/bin/test_genlist.c 2011-10-21 02:43:08 UTC (rev 64224) @@ -1796,10 +1796,9 @@ * gl_moved is called after an item was reordered. * This is only called when reorder mode is enabled. * + * @param data : the genlist object passed as data. * @param obj : the genlist object. * @param item : the moved item. - * @param rel_item : the relative item. - * @param move_after : whether or not the rel_item is after item. * * If the move_after is true, * the item(*item) had been moved after the given relative item(*rel_item) in list. @@ -1807,7 +1806,7 @@ * the item(*item) had been moved before the given relative item(*rel_item) in list. * */ -static void gl_moved(Evas_Object *obj __UNUSED__, Elm_Genlist_Item *item __UNUSED__, Elm_Genlist_Item *rel_item __UNUSED__, Eina_Bool move_after __UNUSED__) +static void gl_moved(Evas_Object *data __UNUSED__, Evas_Object *obj __UNUSED__, Elm_Genlist_Item *item __UNUSED__) { // if needed, add application logic. } @@ -1863,7 +1862,7 @@ itc1.func.icon_get = gl_icon_get; itc1.func.state_get = gl_state_get; itc1.func.del = gl_del; - itc1.func.moved = gl_moved; + evas_object_smart_callback_add(gl, "moved", (Evas_Smart_Cb)gl_moved, gl); for (i = 0; i < 50; i++) elm_genlist_item_append(gl, Modified: trunk/elementary/src/bin/test_store.c =================================================================== --- trunk/elementary/src/bin/test_store.c 2011-10-21 01:50:34 UTC (rev 64223) +++ trunk/elementary/src/bin/test_store.c 2011-10-21 02:43:08 UTC (rev 64224) @@ -34,7 +34,7 @@ // store callbacks to handle loading/parsing/freeing of store items from src static Elm_Genlist_Item_Class itc1 = { - "message", { NULL, NULL, NULL, NULL, NULL }, NULL + "message", { NULL, NULL, NULL, NULL} }; static const Elm_Store_Item_Mapping it1_mapping[] = |
From: Enlightenment S. <no-...@en...> - 2011-10-21 04:04:10
|
Log: add delete button to gengrid test 2 Author: discomfitor Date: 2011-10-20 21:04:03 -0700 (Thu, 20 Oct 2011) New Revision: 64229 Trac: http://trac.enlightenment.org/e/changeset/64229 Modified: trunk/elementary/src/bin/test_gengrid.c Modified: trunk/elementary/src/bin/test_gengrid.c =================================================================== --- trunk/elementary/src/bin/test_gengrid.c 2011-10-21 03:31:26 UTC (rev 64228) +++ trunk/elementary/src/bin/test_gengrid.c 2011-10-21 04:04:03 UTC (rev 64229) @@ -244,6 +244,19 @@ } static void +_delete_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + Evas_Object *grid = data; + Eina_List *l, *l2, *l3; + Elm_Gengrid_Item *it; + + l = elm_gengrid_selected_items_get(grid); + if (!l) return; + EINA_LIST_FOREACH_SAFE(l, l2, l3, it) + elm_gengrid_item_del(it); +} + +static void _prepend_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Testitem *ti; @@ -338,6 +351,12 @@ elm_box_pack_end(hbx, bt); evas_object_show(bt); + bt = elm_button_add(win); + elm_object_text_set(bt, "Delete"); + evas_object_smart_callback_add(bt, "clicked", _delete_bt_clicked, grid); + elm_box_pack_end(hbx, bt); + evas_object_show(bt); + bt = elm_spinner_add(win); elm_spinner_min_max_set(bt, 10, 1024); elm_spinner_value_set(bt, 150); |
From: Enlightenment S. <no-...@en...> - 2011-10-21 07:25:09
|
Log: shut up compile warning Author: discomfitor Date: 2011-10-21 00:25:02 -0700 (Fri, 21 Oct 2011) New Revision: 64243 Trac: http://trac.enlightenment.org/e/changeset/64243 Modified: trunk/elementary/src/bin/test_gengrid.c Modified: trunk/elementary/src/bin/test_gengrid.c =================================================================== --- trunk/elementary/src/bin/test_gengrid.c 2011-10-21 07:22:43 UTC (rev 64242) +++ trunk/elementary/src/bin/test_gengrid.c 2011-10-21 07:25:02 UTC (rev 64243) @@ -250,7 +250,7 @@ Eina_List *l, *l2, *l3; Elm_Gengrid_Item *it; - l = elm_gengrid_selected_items_get(grid); + l = (Eina_List*)elm_gengrid_selected_items_get(grid); if (!l) return; EINA_LIST_FOREACH_SAFE(l, l2, l3, it) elm_gengrid_item_del(it); |
From: Enlightenment S. <no-...@en...> - 2011-11-06 15:58:27
|
Log: remove unused var Author: discomfitor Date: 2011-11-06 07:58:20 -0800 (Sun, 06 Nov 2011) New Revision: 64831 Trac: http://trac.enlightenment.org/e/changeset/64831 Modified: trunk/elementary/src/bin/test_naviframe.c Modified: trunk/elementary/src/bin/test_naviframe.c =================================================================== --- trunk/elementary/src/bin/test_naviframe.c 2011-11-06 15:56:31 UTC (rev 64830) +++ trunk/elementary/src/bin/test_naviframe.c 2011-11-06 15:58:20 UTC (rev 64831) @@ -49,7 +49,7 @@ void _page5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *bt, *en, *content, *nf = data; + Evas_Object *bt, *content, *nf = data; Elm_Object_Item *it; bt = elm_button_add(nf); |
From: Enlightenment S. <no-...@en...> - 2011-11-21 18:55:03
|
Log: use strcasecmp for cmdline testing so I don't have to use caps randomly Author: discomfitor Date: 2011-11-21 10:54:53 -0800 (Mon, 21 Nov 2011) New Revision: 65488 Trac: http://trac.enlightenment.org/e/changeset/65488 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-11-21 16:14:52 UTC (rev 65487) +++ trunk/elementary/src/bin/test.c 2011-11-21 18:54:53 UTC (rev 65488) @@ -507,7 +507,7 @@ if (autorun) { EINA_LIST_FOREACH(tests, l, t) - if ((t->name) && (t->cb) && (!strcmp(t->name, autorun))) + if ((t->name) && (t->cb) && (!strcasecmp(t->name, autorun))) t->cb(NULL, NULL, NULL); } |
From: Enlightenment S. <no-...@en...> - 2011-11-23 23:14:19
|
Log: match partial test words in elm_test Author: discomfitor Date: 2011-11-23 15:14:12 -0800 (Wed, 23 Nov 2011) New Revision: 65544 Trac: http://trac.enlightenment.org/e/changeset/65544 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-11-23 21:21:33 UTC (rev 65543) +++ trunk/elementary/src/bin/test.c 2011-11-23 23:14:12 UTC (rev 65544) @@ -506,8 +506,9 @@ if (autorun) { + size_t alen = strlen(autorun); EINA_LIST_FOREACH(tests, l, t) - if ((t->name) && (t->cb) && (!strcasecmp(t->name, autorun))) + if ((t->name) && (t->cb) && (!strncasecmp(t->name, autorun, alen))) t->cb(NULL, NULL, NULL); } |
From: Enlightenment S. <no-...@en...> - 2011-11-24 03:22:39
|
Log: only run one test Author: discomfitor Date: 2011-11-23 19:22:32 -0800 (Wed, 23 Nov 2011) New Revision: 65554 Trac: http://trac.enlightenment.org/e/changeset/65554 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-11-24 02:42:46 UTC (rev 65553) +++ trunk/elementary/src/bin/test.c 2011-11-24 03:22:32 UTC (rev 65554) @@ -510,8 +510,13 @@ { size_t alen = strlen(autorun); EINA_LIST_FOREACH(tests, l, t) - if ((t->name) && (t->cb) && (!strncasecmp(t->name, autorun, alen))) - t->cb(NULL, NULL, NULL); + { + if ((t->name) && (t->cb) && (!strncasecmp(t->name, autorun, alen))) + { + t->cb(NULL, NULL, NULL); + break; + } + } } |
From: Enlightenment S. <no-...@en...> - 2011-11-24 05:07:30
|
Log: make insanely huge icon scale with screen size, this is broken somehow because of some icon sizing bug Author: discomfitor Date: 2011-11-23 21:07:23 -0800 (Wed, 23 Nov 2011) New Revision: 65562 Trac: http://trac.enlightenment.org/e/changeset/65562 Modified: trunk/elementary/src/bin/test_tooltip.c Modified: trunk/elementary/src/bin/test_tooltip.c =================================================================== --- trunk/elementary/src/bin/test_tooltip.c 2011-11-24 04:52:16 UTC (rev 65561) +++ trunk/elementary/src/bin/test_tooltip.c 2011-11-24 05:07:23 UTC (rev 65562) @@ -142,11 +142,23 @@ Evas_Object *tt, void *item __UNUSED__) { + int w, h, sw, sh; Evas_Object *ic = elm_icon_add(tt); + char buf[PATH_MAX]; snprintf(buf, sizeof(buf), "%s/images/insanely_huge_test_image.jpg", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); - elm_icon_scale_set(ic, 0, 0); + elm_icon_size_get(ic, &w, &h); + elm_win_screen_size_get(tt, NULL, NULL, &sw, &sh); + if ((w > sw) || (h > sh)) + { + float sc = 0; + if ((float)w / (float)sw >= 0.8) + sc = ((float)sw * 0.8) / (float)w; + else if ((float)h / (float)sh >= 0.8) + sc = ((float)sh * 0.8) / (float)h; + if (sc) elm_object_scale_set(ic, sc); + } return ic; } |
From: Enlightenment S. <no-...@en...> - 2011-12-10 17:24:13
|
Log: add tooltips to naviframe buttons for hahas Author: discomfitor Date: 2011-12-10 09:24:06 -0800 (Sat, 10 Dec 2011) New Revision: 66089 Trac: http://trac.enlightenment.org/e/changeset/66089 Modified: trunk/elementary/src/bin/test_naviframe.c Modified: trunk/elementary/src/bin/test_naviframe.c =================================================================== --- trunk/elementary/src/bin/test_naviframe.c 2011-12-10 17:01:15 UTC (rev 66088) +++ trunk/elementary/src/bin/test_naviframe.c 2011-12-10 17:24:06 UTC (rev 66089) @@ -4,12 +4,17 @@ #endif #ifndef ELM_LIB_QUICKLAUNCH -static const char *img1 = PACKAGE_DATA_DIR"/images/logo.png"; -static const char *img2 = PACKAGE_DATA_DIR"/images/plant_01.jpg"; -static const char *img3 = PACKAGE_DATA_DIR"/images/rock_01.jpg"; -static const char *img4 = PACKAGE_DATA_DIR"/images/rock_02.jpg"; -static const char *img5 = PACKAGE_DATA_DIR"/images/sky_01.jpg"; +#define BUTTON_TEXT_SET(BT, TEXT) \ + elm_object_text_set((BT), (TEXT)); \ + elm_object_tooltip_text_set((BT), (TEXT)); \ + elm_object_tooltip_window_mode_set((BT), EINA_TRUE) +static const char *img1 = PACKAGE_DATA_DIR "/images/logo.png"; +static const char *img2 = PACKAGE_DATA_DIR "/images/plant_01.jpg"; +static const char *img3 = PACKAGE_DATA_DIR "/images/rock_01.jpg"; +static const char *img4 = PACKAGE_DATA_DIR "/images/rock_02.jpg"; +static const char *img5 = PACKAGE_DATA_DIR "/images/sky_01.jpg"; + Evas_Object * _content_new(Evas_Object *parent, const char *img) { @@ -59,11 +64,11 @@ bt = elm_button_add(nf); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(bt, "Prev"); + BUTTON_TEXT_SET(bt, "Prev"); bt2 = elm_button_add(nf); evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(bt2, "Page 1"); + BUTTON_TEXT_SET(bt2, "Page 1"); evas_object_smart_callback_add(bt2, "clicked", _promote, evas_object_data_get(nf, "page1")); @@ -124,12 +129,12 @@ bt = elm_button_add(nf); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(bt, "Prev"); + BUTTON_TEXT_SET(bt, "Prev"); evas_object_smart_callback_add(bt, "clicked", _navi_pop, nf); bt2 = elm_button_add(nf); evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(bt2, "Next"); + BUTTON_TEXT_SET(bt2, "Next"); evas_object_smart_callback_add(bt2, "clicked", _page4, nf); content = _content_new(nf, img3); @@ -197,7 +202,7 @@ btn = elm_button_add(nf); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_smart_callback_add(btn, "clicked", _page2, nf); - elm_object_text_set(btn, "Next"); + BUTTON_TEXT_SET(btn, "Next"); evas_object_show(btn); content = _content_new(nf, img1); |
From: Enlightenment S. <no-...@en...> - 2011-12-29 12:03:48
|
Log: From: Hyoyoung Chang <hyo...@gm...> Subject: [E-devel] [patch] add copy&paste example to elementary_test Date: Thu, 29 Dec 2011 18:08:48 +0900 Dear all, It's a patch to add copy&paste example to elm test in misc section. In this time, it contains only simple copying and paste, but i'll more extend. Thank you Author: discomfitor Date: 2011-12-29 04:03:42 -0800 (Thu, 29 Dec 2011) New Revision: 66629 Trac: http://trac.enlightenment.org/e/changeset/66629 Added: trunk/elementary/src/bin/test_cnp.c Modified: trunk/elementary/src/bin/Makefile.am trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/Makefile.am =================================================================== --- trunk/elementary/src/bin/Makefile.am 2011-12-29 11:53:28 UTC (rev 66628) +++ trunk/elementary/src/bin/Makefile.am 2011-12-29 12:03:42 UTC (rev 66629) @@ -43,6 +43,7 @@ test_calendar.c \ test_check.c \ test_clock.c \ +test_cnp.c \ test_colorselector.c \ test_conform.c \ test_ctxpopup.c \ Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-12-29 11:53:28 UTC (rev 66628) +++ trunk/elementary/src/bin/test.c 2011-12-29 12:03:42 UTC (rev 66629) @@ -14,6 +14,7 @@ void test_box_horiz(void *data, Evas_Object *obj, void *event_info); void test_box_transition(void *data, Evas_Object *obj, void *event_info); void test_button(void *data, Evas_Object *obj, void *event_info); +void test_cnp(void *data, Evas_Object *obj, void *event_info); void test_transit(void *data, Evas_Object *obj, void *event_info); void test_transit2(void *data, Evas_Object *obj, void *event_info); void test_transit3(void *data, Evas_Object *obj, void *event_info); @@ -507,6 +508,7 @@ ADD_TEST(NULL, "Helpers", "Factory", test_factory); //------------------------------// + ADD_TEST(NULL, "Micellaneous", "Copy And Paste", test_cnp); ADD_TEST(NULL, "Micellaneous", "Weather", test_weather); ADD_TEST(NULL, "Micellaneous", "Icon Desktops", test_icon_desktops); ADD_TEST(NULL, "Micellaneous", "Floating Objects", test_floating); |
From: Enlightenment S. <no-...@en...> - 2012-01-04 04:52:36
|
Log: add collapsing frames and (broken) scrolling Author: discomfitor Date: 2012-01-03 20:52:30 -0800 (Tue, 03 Jan 2012) New Revision: 66845 Trac: http://trac.enlightenment.org/e/changeset/66845 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2012-01-04 04:45:33 UTC (rev 66844) +++ trunk/elementary/src/bin/test.c 2012-01-04 04:52:30 UTC (rev 66845) @@ -209,7 +209,7 @@ Evas_Object *fr = NULL, *tg = NULL, *sc = NULL, *ic = NULL; Evas_Object *tbx = NULL, *cfr = NULL, *tbx2 = NULL, *bt = NULL; Eina_List *tests, *l; - struct elm_test *t; + struct elm_test *t, *tt; if (test_win_only) goto add_tests; /* Create an elm window - It returns an evas object. This is a little @@ -528,6 +528,7 @@ } } + tt = t; if (test_win_only) return; @@ -541,6 +542,7 @@ { cfr = elm_frame_add(win); // FIXME: add new style of frame for this + elm_frame_autocollapse_set(cfr, EINA_TRUE); elm_object_text_set(cfr, t->category); evas_object_size_hint_weight_set(cfr, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_fill_set(cfr, EVAS_HINT_FILL, 0.0); @@ -580,7 +582,15 @@ evas_object_resize(win, 480, 480); /* show the window */ if (!test_win_only) - evas_object_show(win); + { + evas_object_show(win); + if (autorun) + { + Evas_Coord x, y; + evas_object_geometry_get(tbx2, &x, &y, NULL, NULL); + elm_scroller_region_bring_in(sc, x, y, 0, 0); + } + } } /* this is your elementary main function - it MUST be called IMMEDIATELY |
From: Enlightenment S. <no-...@en...> - 2012-01-04 04:59:25
|
Log: slightly more working (but still broken) autoscrolling in test app Author: discomfitor Date: 2012-01-03 20:59:18 -0800 (Tue, 03 Jan 2012) New Revision: 66846 Trac: http://trac.enlightenment.org/e/changeset/66846 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2012-01-04 04:52:30 UTC (rev 66845) +++ trunk/elementary/src/bin/test.c 2012-01-04 04:59:18 UTC (rev 66846) @@ -209,7 +209,8 @@ Evas_Object *fr = NULL, *tg = NULL, *sc = NULL, *ic = NULL; Evas_Object *tbx = NULL, *cfr = NULL, *tbx2 = NULL, *bt = NULL; Eina_List *tests, *l; - struct elm_test *t, *tt; + struct elm_test *t; + void *tt; if (test_win_only) goto add_tests; /* Create an elm window - It returns an evas object. This is a little @@ -574,6 +575,7 @@ evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", t->cb, NULL); pcat = t->category; + if (t == tt) tt = cfr; free(t); } } @@ -584,10 +586,11 @@ if (!test_win_only) { evas_object_show(win); + /* bring in autorun frame */ if (autorun) { Evas_Coord x, y; - evas_object_geometry_get(tbx2, &x, &y, NULL, NULL); + evas_object_geometry_get(tt, &x, &y, NULL, NULL); elm_scroller_region_bring_in(sc, x, y, 0, 0); } } |
From: Enlightenment S. <no-...@en...> - 2012-01-04 05:26:43
|
Log: add autocollapse for info frame at top too :) Author: discomfitor Date: 2012-01-03 21:26:37 -0800 (Tue, 03 Jan 2012) New Revision: 66851 Trac: http://trac.enlightenment.org/e/changeset/66851 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2012-01-04 05:24:54 UTC (rev 66850) +++ trunk/elementary/src/bin/test.c 2012-01-04 05:26:37 UTC (rev 66851) @@ -265,6 +265,7 @@ evas_object_show(bx0); fr = elm_frame_add(win); + elm_frame_autocollapse_set(fr, EINA_TRUE); elm_object_text_set(fr, "Information"); elm_box_pack_end(bx0, fr); evas_object_show(fr); |
From: Enlightenment S. <no-...@en...> - 2012-01-14 03:37:41
|
Log: add printf for frame clicks in elm test Author: discomfitor Date: 2012-01-13 19:37:35 -0800 (Fri, 13 Jan 2012) New Revision: 67200 Trac: http://trac.enlightenment.org/e/changeset/67200 Modified: trunk/elementary/src/bin/test.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2012-01-14 02:49:00 UTC (rev 67199) +++ trunk/elementary/src/bin/test.c 2012-01-14 03:37:35 UTC (rev 67200) @@ -204,6 +204,11 @@ elm_mirrored_set(elm_check_state_get(obj)); } +static void +_frame_clicked(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +{ + printf("frame %p is: %s\n", obj, elm_frame_collapse_get(obj) ? "collapsed" : "expanded"); +} static void my_win_main(char *autorun, Eina_Bool test_win_only) @@ -268,6 +273,7 @@ evas_object_show(bx0); fr = elm_frame_add(win); + evas_object_smart_callback_add(fr, "clicked", _frame_clicked, NULL); elm_frame_autocollapse_set(fr, EINA_TRUE); elm_object_text_set(fr, "Information"); elm_box_pack_end(bx0, fr); @@ -550,6 +556,7 @@ { cfr = elm_frame_add(win); // FIXME: add new style of frame for this + evas_object_smart_callback_add(cfr, "clicked", _frame_clicked, NULL); elm_frame_autocollapse_set(cfr, EINA_TRUE); elm_object_text_set(cfr, t->category); evas_object_size_hint_weight_set(cfr, EVAS_HINT_EXPAND, 0.0); |
From: Enlightenment S. <no-...@en...> - 2012-02-12 22:36:02
|
Log: panel test is now less retarded and opens much faster Author: discomfitor Date: 2012-02-12 14:35:56 -0800 (Sun, 12 Feb 2012) New Revision: 67863 Trac: http://trac.enlightenment.org/e/changeset/67863 Modified: trunk/elementary/src/bin/test_panel.c Modified: trunk/elementary/src/bin/test_panel.c =================================================================== --- trunk/elementary/src/bin/test_panel.c 2012-02-12 22:24:35 UTC (rev 67862) +++ trunk/elementary/src/bin/test_panel.c 2012-02-12 22:35:56 UTC (rev 67863) @@ -4,6 +4,8 @@ #endif #ifndef ELM_LIB_QUICKLAUNCH +#define LIST_ITEM_MAX 20 + static Elm_Genlist_Item_Class itc; static void _bstatus(void *data, Evas_Object *obj, void *event_info); @@ -15,6 +17,8 @@ static void _fill_list(Evas_Object *obj); static Eina_Bool _dir_has_subs(const char *path); +static Eina_List *dirs = NULL; + static void _tstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__) { @@ -87,24 +91,26 @@ { DIR *d; struct dirent *de; - Eina_List *dirs = NULL, *l; + Eina_List *l; char *real; + unsigned int x = 0; - if (!(d = opendir(getenv("HOME")))) return; - while ((de = readdir(d))) + if (!dirs) { - char buff[PATH_MAX]; + if (!(d = opendir(getenv("HOME")))) return; + while ((de = readdir(d)) && (x < LIST_ITEM_MAX)) + { + char buff[PATH_MAX]; - if (de->d_name[0] == '.') continue; - snprintf(buff, sizeof(buff), "%s/%s", getenv("HOME"), de->d_name); - if (!ecore_file_is_dir(buff)) continue; - real = ecore_file_realpath(buff); - dirs = eina_list_append(dirs, real); + if (de->d_name[0] == '.') continue; + snprintf(buff, sizeof(buff), "%s/%s", getenv("HOME"), de->d_name); + if (!ecore_file_is_dir(buff)) continue; + x++; + real = ecore_file_realpath(buff); + dirs = eina_list_sorted_insert(dirs, EINA_COMPARE_CB(strcoll), real); + } + closedir(d); } - closedir(d); - - dirs = eina_list_sort(dirs, eina_list_count(dirs), EINA_COMPARE_CB(strcoll)); - EINA_LIST_FOREACH(dirs, l, real) { Eina_Bool result = EINA_FALSE; @@ -117,9 +123,7 @@ elm_genlist_item_append(obj, &itc, eina_stringshare_add(real), NULL, ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL); - free(real); } - eina_list_free(dirs); } static Eina_Bool @@ -234,6 +238,11 @@ evas_object_show(panel); _fill_list(list); + { + char *dir; + EINA_LIST_FREE(dirs, dir) + free(dir); + } elm_box_pack_end(vbx, bx); |
From: Enlightenment S. <no-...@en...> - 2012-02-28 20:15:04
|
Log: replicate new bug from 68495 Author: discomfitor Date: 2012-02-28 12:14:56 -0800 (Tue, 28 Feb 2012) New Revision: 68514 Trac: http://trac.enlightenment.org/e/changeset/68514 Modified: trunk/elementary/src/bin/test_toolbar.c Modified: trunk/elementary/src/bin/test_toolbar.c =================================================================== --- trunk/elementary/src/bin/test_toolbar.c 2012-02-28 18:10:19 UTC (rev 68513) +++ trunk/elementary/src/bin/test_toolbar.c 2012-02-28 20:14:56 UTC (rev 68514) @@ -85,10 +85,10 @@ evas_object_show(bx); tb = elm_toolbar_add(win); - elm_toolbar_homogeneous_set(tb, 0); elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU); evas_object_size_hint_weight_set(tb, 0.0, 0.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); + elm_object_scale_set(tb, 0.9); ph1 = elm_photo_add(win); ph2 = elm_photo_add(win); |
From: Enlightenment S. <no-...@en...> - 2012-03-01 20:16:35
|
Log: @68591: multiselect here is intentional to allow for theme overlays try asking in irc or mailing list before randomly changing things like this. Author: discomfitor Date: 2012-03-01 12:16:28 -0800 (Thu, 01 Mar 2012) New Revision: 68592 Trac: http://trac.enlightenment.org/e/changeset/68592 Modified: trunk/elementary/src/bin/config.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2012-03-01 20:12:47 UTC (rev 68591) +++ trunk/elementary/src/bin/config.c 2012-03-01 20:16:28 UTC (rev 68592) @@ -1335,6 +1335,7 @@ evas_object_show(pd); li = elm_list_add(win); + elm_list_multi_select_set(li, EINA_TRUE); evas_object_size_hint_weight_set(li, 1.0, 1.0); evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_content_set(pd, li); |
From: Enlightenment S. <no-...@en...> - 2012-03-07 15:09:20
|
Log: scale -> resizable Author: discomfitor Date: 2012-03-07 07:09:09 -0800 (Wed, 07 Mar 2012) New Revision: 68969 Trac: http://trac.enlightenment.org/e/changeset/68969 Modified: trunk/elementary/src/bin/test_gengrid.c trunk/elementary/src/bin/test_icon.c Modified: trunk/elementary/src/bin/test_gengrid.c =================================================================== --- trunk/elementary/src/bin/test_gengrid.c 2012-03-07 15:09:05 UTC (rev 68968) +++ trunk/elementary/src/bin/test_gengrid.c 2012-03-07 15:09:09 UTC (rev 68969) @@ -155,7 +155,7 @@ char buf[PATH_MAX]; snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); - elm_icon_scale_set(ic, 0, 0); + elm_icon_resizable_set(ic, 0, 0); return ic; } Modified: trunk/elementary/src/bin/test_icon.c =================================================================== --- trunk/elementary/src/bin/test_icon.c 2012-03-07 15:09:05 UTC (rev 68968) +++ trunk/elementary/src/bin/test_icon.c 2012-03-07 15:09:09 UTC (rev 68969) @@ -42,7 +42,7 @@ evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_icon_scale_set(ic, EINA_TRUE, EINA_TRUE); + elm_icon_resizable_set(ic, EINA_TRUE, EINA_TRUE); elm_icon_aspect_fixed_set(ic, EINA_FALSE); elm_icon_preload_set(ic, EINA_TRUE); elm_icon_prescale_set(ic, EINA_TRUE); @@ -77,7 +77,7 @@ char buf[PATH_MAX]; snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); - elm_icon_scale_set(ic, EINA_TRUE, EINA_TRUE); + elm_icon_resizable_set(ic, EINA_TRUE, EINA_TRUE); evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL); |
From: Enlightenment S. <no-...@en...> - 2012-03-07 19:43:04
|
Log: prevent toolbar items being deselected Author: discomfitor Date: 2012-03-07 11:42:52 -0800 (Wed, 07 Mar 2012) New Revision: 69020 Trac: http://trac.enlightenment.org/e/changeset/69020 Modified: trunk/elementary/src/bin/config.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2012-03-07 19:39:22 UTC (rev 69019) +++ trunk/elementary/src/bin/config.c 2012-03-07 19:42:52 UTC (rev 69020) @@ -2965,6 +2965,7 @@ Elm_Object_Item *tb_sizing, *tb_it; tb = elm_toolbar_add(win); + elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_ALWAYS); elm_toolbar_menu_parent_set(tb, win); elm_toolbar_homogeneous_set(tb, EINA_FALSE); evas_object_size_hint_weight_set(tb, 1.0, 0.0); |