From: Enlightenment S. <no-...@en...> - 2009-05-14 21:03:31
|
Log: Pass the event_info in the "clicked" callback so apps can determine what button was clicked. Author: devilhorns Date: 2009-05-14 14:03:20 -0700 (Thu, 14 May 2009) New Revision: 40647 Modified: trunk/TMP/st/elementary/src/lib/elm_icon.c Modified: trunk/TMP/st/elementary/src/lib/elm_icon.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_icon.c 2009-05-14 18:36:01 UTC (rev 40646) +++ trunk/TMP/st/elementary/src/lib/elm_icon.c 2009-05-14 21:03:20 UTC (rev 40647) @@ -54,7 +54,8 @@ if (wd->no_scale) _els_smart_icon_scale_set(wd->img, 1.0); else { - _els_smart_icon_scale_set(wd->img, elm_widget_scale_get(obj) * _elm_config->scale); + _els_smart_icon_scale_set(wd->img, elm_widget_scale_get(obj) * + _elm_config->scale); _els_smart_icon_size_get(wd->img, &w, &h); } if (!wd->scale_down) @@ -74,7 +75,7 @@ static void _mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) { - evas_object_smart_callback_call(data, "clicked", NULL); + evas_object_smart_callback_call(data, "clicked", event_info); } EAPI Evas_Object * |
From: Enlightenment S. <no-...@en...> - 2009-08-25 22:53:27
|
Log: Remove commented out line as it's not needed. Author: devilhorns Date: 2009-08-25 15:53:13 -0700 (Tue, 25 Aug 2009) New Revision: 41993 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-25 22:51:24 UTC (rev 41992) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-25 22:53:13 UTC (rev 41993) @@ -78,7 +78,6 @@ edje_object_signal_emit(it->base, "elm,state,disabled", "elm"); else edje_object_signal_emit(it->base, "elm,state,enabled", "elm"); -// _item_show(it); } static void |
From: Enlightenment S. <no-...@en...> - 2009-08-25 23:47:20
|
Log: Add function (ability) to change a toolbar item's Label. Author: devilhorns Date: 2009-08-25 16:47:08 -0700 (Tue, 25 Aug 2009) New Revision: 41997 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-25 23:06:40 UTC (rev 41996) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-25 23:47:08 UTC (rev 41997) @@ -548,6 +548,7 @@ EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); EAPI Evas_Object *elm_toolbar_item_icon_get(Elm_Toolbar_Item *item); EAPI const char *elm_toolbar_item_label_get(Elm_Toolbar_Item *item); + EAPI void elm_toolbar_item_label_set(Elm_Toolbar_Item *item, const char *label); EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *item); EAPI void elm_toolbar_item_select(Elm_Toolbar_Item *item); EAPI Eina_Bool elm_toolbar_item_disabled_get(Elm_Toolbar_Item *item); Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-25 23:06:40 UTC (rev 41996) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-25 23:47:08 UTC (rev 41997) @@ -289,6 +289,15 @@ return item->label; } +EAPI void +elm_toolbar_item_label_set(Elm_Toolbar_Item *item, const char *label) +{ + if (!item) return; + eina_stringshare_del(item->label); + item->label = eina_stringshare_add(label); + edje_object_part_text_set(item->base, "elm.text", item->label); +} + EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *it) { |
From: Enlightenment S. <no-...@en...> - 2009-08-26 00:31:07
|
Log: Add function to allow setting toolbar icon size. Author: devilhorns Date: 2009-08-25 17:30:55 -0700 (Tue, 25 Aug 2009) New Revision: 41998 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-25 23:47:08 UTC (rev 41997) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-26 00:30:55 UTC (rev 41998) @@ -545,6 +545,7 @@ typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item; EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent); + EAPI void elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size); EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); EAPI Evas_Object *elm_toolbar_item_icon_get(Elm_Toolbar_Item *item); EAPI const char *elm_toolbar_item_label_get(Elm_Toolbar_Item *item); Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-25 23:47:08 UTC (rev 41997) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 00:30:55 UTC (rev 41998) @@ -232,6 +232,15 @@ return obj; } +EAPI void +elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size) +{ + Widget_Data *wd = elm_widget_data_get(obj); + + wd->icon_size = icon_size; + _theme_hook(obj); +} + EAPI Elm_Toolbar_Item * elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data) { |
From: Enlightenment S. <no-...@en...> - 2009-08-26 00:47:50
|
Log: Add function to return the icon size. Add trap for a max icon size (currently hard-coded to 48 as anything greater causes issues with the buttons). Add trap to check if the toolbar's icon size is already set to what is requested. This trap added, because without it the toolbar goes into a "disabled" look. Author: devilhorns Date: 2009-08-25 17:47:31 -0700 (Tue, 25 Aug 2009) New Revision: 42000 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-26 00:36:59 UTC (rev 41999) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-26 00:47:31 UTC (rev 42000) @@ -545,7 +545,8 @@ typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item; EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent); - EAPI void elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size); + EAPI void elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size); + EAPI int elm_toolbar_icon_size_get(Evas_Object *obj); EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); EAPI Evas_Object *elm_toolbar_item_icon_get(Elm_Toolbar_Item *item); EAPI const char *elm_toolbar_item_label_get(Elm_Toolbar_Item *item); Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 00:36:59 UTC (rev 41999) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 00:47:31 UTC (rev 42000) @@ -237,10 +237,20 @@ { Widget_Data *wd = elm_widget_data_get(obj); + if (icon_size > 48) return; + if (wd->icon_size == icon_size) return; wd->icon_size = icon_size; _theme_hook(obj); } +EAPI int +elm_toolbar_icon_size_get(Evas_Object *obj) +{ + Widget_Data *wd = elm_widget_data_get(obj); + + return wd->icon_size; +} + EAPI Elm_Toolbar_Item * elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data) { |
From: Enlightenment S. <no-...@en...> - 2009-08-26 00:50:02
|
Log: Check that item is valid before we try to set a disabled state on it. Perhaps a bit overkill here, but at least we don't crash if item == NULL :) Author: devilhorns Date: 2009-08-25 17:49:38 -0700 (Tue, 25 Aug 2009) New Revision: 42001 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 00:47:31 UTC (rev 42000) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 00:49:38 UTC (rev 42001) @@ -347,6 +347,7 @@ EAPI void elm_toolbar_item_disabled_set(Elm_Toolbar_Item *item, Eina_Bool disabled) { + if (!item) return; _item_disable(item, disabled); } |
From: Enlightenment S. <no-...@en...> - 2009-08-26 14:29:31
|
Log: Add traps to test that elm_widget_data_get actually returned something. Author: devilhorns Date: 2009-08-26 07:29:18 -0700 (Wed, 26 Aug 2009) New Revision: 42011 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 14:25:49 UTC (rev 42010) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 14:29:18 UTC (rev 42011) @@ -36,6 +36,7 @@ Widget_Data *wd = elm_widget_data_get(it->obj); Evas_Coord x, y, w, h, bx, by; + if (!wd) return; evas_object_geometry_get(wd->bx, &bx, &by, NULL, NULL); evas_object_geometry_get(it->base, &x, &y, &w, &h); elm_smart_scroller_child_region_show(wd->scr, x - bx, y - by, w, h); @@ -49,6 +50,7 @@ Evas_Object *obj2; const Eina_List *l; + if (!wd) return; if ((it->selected) || (it->disabled)) return; EINA_LIST_FOREACH(wd->items, l, it2) { @@ -72,6 +74,7 @@ { Widget_Data *wd = elm_widget_data_get(it->obj); + if (!wd) return; if (it->disabled == disabled) return; it->disabled = disabled; if (it->disabled) @@ -86,6 +89,7 @@ Widget_Data *wd = elm_widget_data_get(obj); Elm_Toolbar_Item *it; + if (!wd) return; EINA_LIST_FREE(wd->items, it) { eina_stringshare_del(it->label); @@ -105,6 +109,7 @@ Evas_Coord mw, mh; const char *style = elm_widget_style_get(obj); + if (!wd) return; edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale); EINA_LIST_FOREACH(wd->items, l, it) { @@ -139,6 +144,7 @@ Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; Evas_Coord vw = 0, vh = 0; + if (!wd) return; edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh); evas_object_resize(wd->scr, 500, 500); evas_object_size_hint_min_get(wd->bx, &minw, &minh); @@ -166,6 +172,7 @@ const Eina_List *l; Elm_Toolbar_Item *it; + if (!wd) return; elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); evas_object_size_hint_min_get(wd->bx, &mw, &mh); evas_object_geometry_get(wd->bx, NULL, NULL, &w, &h); @@ -237,6 +244,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; if (icon_size > 48) return; if (wd->icon_size == icon_size) return; wd->icon_size = icon_size; @@ -248,6 +256,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return 0; return wd->icon_size; } @@ -258,7 +267,7 @@ Evas_Coord mw, mh; Elm_Toolbar_Item *it = calloc(1, sizeof(Elm_Toolbar_Item)); - if (!it) return NULL; + if ((!it) || (!wd)) return NULL; wd->items = eina_list_append(wd->items, it); it->obj = obj; it->label = eina_stringshare_add(label); @@ -323,6 +332,7 @@ Widget_Data *wd = elm_widget_data_get(it->obj); Evas_Object *obj2 = it->obj; + if (!wd) return; wd->items = eina_list_remove(wd->items, it); eina_stringshare_del(it->label); if (it->icon) evas_object_del(it->icon); @@ -356,6 +366,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; wd->scrollable = scrollable; _sizing_eval(obj); } |
From: Enlightenment S. <no-...@en...> - 2009-08-26 14:35:05
|
Log: Don't calloc a toolbar item if elm_widget_data_get returns NULL. Slightly better trapping(s). Author: devilhorns Date: 2009-08-26 07:34:55 -0700 (Wed, 26 Aug 2009) New Revision: 42012 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 14:29:18 UTC (rev 42011) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 14:34:55 UTC (rev 42012) @@ -265,9 +265,10 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord mw, mh; - Elm_Toolbar_Item *it = calloc(1, sizeof(Elm_Toolbar_Item)); + Elm_Toolbar_Item *it; - if ((!it) || (!wd)) return NULL; + if (!wd) return NULL; + it = = calloc(1, sizeof(Elm_Toolbar_Item)); wd->items = eina_list_append(wd->items, it); it->obj = obj; it->label = eina_stringshare_add(label); @@ -332,7 +333,7 @@ Widget_Data *wd = elm_widget_data_get(it->obj); Evas_Object *obj2 = it->obj; - if (!wd) return; + if ((!wd) || (!it)) return; wd->items = eina_list_remove(wd->items, it); eina_stringshare_del(it->label); if (it->icon) evas_object_del(it->icon); |
From: Enlightenment S. <no-...@en...> - 2009-08-26 14:42:55
|
Log: Oops, small typo. Author: devilhorns Date: 2009-08-26 07:42:40 -0700 (Wed, 26 Aug 2009) New Revision: 42013 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 14:34:55 UTC (rev 42012) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 14:42:40 UTC (rev 42013) @@ -268,7 +268,7 @@ Elm_Toolbar_Item *it; if (!wd) return NULL; - it = = calloc(1, sizeof(Elm_Toolbar_Item)); + it = calloc(1, sizeof(Elm_Toolbar_Item)); wd->items = eina_list_append(wd->items, it); it->obj = obj; it->label = eina_stringshare_add(label); |
From: Enlightenment S. <no-...@en...> - 2009-08-26 16:23:03
|
Log: Add missing check for calloc failure, thanks Vincent :) Author: devilhorns Date: 2009-08-26 09:22:52 -0700 (Wed, 26 Aug 2009) New Revision: 42019 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 15:43:45 UTC (rev 42018) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-26 16:22:52 UTC (rev 42019) @@ -269,6 +269,7 @@ if (!wd) return NULL; it = calloc(1, sizeof(Elm_Toolbar_Item)); + if (!it) return NULL; wd->items = eina_list_append(wd->items, it); it->obj = obj; it->label = eina_stringshare_add(label); |
From: Enlightenment S. <no-...@en...> - 2009-08-26 16:53:06
|
Log: Simplier check for disabled state. Author: devilhorns Date: 2009-08-26 09:52:53 -0700 (Wed, 26 Aug 2009) New Revision: 42022 Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_widget.c 2009-08-26 16:52:10 UTC (rev 42021) +++ trunk/TMP/st/elementary/src/lib/elm_widget.c 2009-08-26 16:52:53 UTC (rev 42022) @@ -645,8 +645,7 @@ elm_widget_disabled_set(Evas_Object *obj, int disabled) { API_ENTRY return; - if (((sd->disabled) && (disabled)) || - ((!sd->disabled) && (!disabled))) return; + if (sd->disabled == disabled) return; sd->disabled = disabled; if (sd->focused) { |
From: Enlightenment S. <no-...@en...> - 2009-08-30 16:33:11
|
Log: Formatting. Only calculate min_size once in certain places, rather than several calculations. Author: devilhorns Date: 2009-08-30 09:33:03 -0700 (Sun, 30 Aug 2009) New Revision: 42108 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-30 15:33:08 UTC (rev 42107) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-30 16:33:03 UTC (rev 42108) @@ -110,10 +110,12 @@ const char *style = elm_widget_style_get(obj); if (!wd) return; - edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale); + edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * + _elm_config->scale); EINA_LIST_FOREACH(wd->items, l, it) { - edje_object_scale_set(it->base, elm_widget_scale_get(obj) * _elm_config->scale); + edje_object_scale_set(it->base, elm_widget_scale_get(obj) * + _elm_config->scale); if (it->selected) edje_object_signal_emit(it->base, "elm,state,selected", "elm"); if (it->disabled) @@ -121,9 +123,11 @@ _elm_theme_set(it->base, "toolbar", "item", style); if (it->icon) { + int ms = 0; + + ms = ((double)wd->icon_size * _elm_config->scale); edje_extern_object_min_size_set(it->icon, - (double)wd->icon_size * _elm_config->scale, - (double)wd->icon_size * _elm_config->scale); + ms, ms); edje_object_part_swallow(it->base, "elm.swallow.icon", it->icon); } edje_object_part_text_set(it->base, "elm.text", it->label); @@ -145,7 +149,8 @@ Evas_Coord vw = 0, vh = 0; if (!wd) return; - edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh); + edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), + &minw, &minh); evas_object_resize(wd->scr, 500, 500); evas_object_size_hint_min_get(wd->bx, &minw, &minh); evas_object_resize(wd->bx, minw, minh); @@ -188,7 +193,6 @@ break; } } - } static void @@ -232,8 +236,7 @@ elm_smart_scroller_child_set(wd->scr, wd->bx); evas_object_show(wd->bx); - evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_RESIZE, - _resize, obj); + evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_RESIZE, _resize, obj); _sizing_eval(obj); return obj; @@ -283,9 +286,10 @@ elm_widget_sub_object_add(obj, it->base); if (it->icon) { - edje_extern_object_min_size_set(it->icon, - (double)wd->icon_size * _elm_config->scale, - (double)wd->icon_size * _elm_config->scale); + int ms = 0; + + ms = ((double)wd->icon_size * _elm_config->scale); + edje_extern_object_min_size_set(it->icon, ms, ms); edje_object_part_swallow(it->base, "elm.swallow.icon", it->icon); evas_object_show(it->icon); elm_widget_sub_object_add(obj, it->icon); @@ -346,6 +350,7 @@ EAPI void elm_toolbar_item_select(Elm_Toolbar_Item *item) { + if (!item) return; _item_select(item); } |
From: Enlightenment S. <no-...@en...> - 2009-08-30 16:56:30
|
Log: Add missing EAPI function for toolbar_separator_get. Author: devilhorns Date: 2009-08-30 09:56:17 -0700 (Sun, 30 Aug 2009) New Revision: 42110 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-30 16:54:15 UTC (rev 42109) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2009-08-30 16:56:17 UTC (rev 42110) @@ -556,6 +556,7 @@ EAPI Eina_Bool elm_toolbar_item_disabled_get(Elm_Toolbar_Item *item); EAPI void elm_toolbar_item_disabled_set(Elm_Toolbar_Item *item, Eina_Bool disabled); EAPI void elm_toolbar_item_separator_set(Elm_Toolbar_Item *item, Eina_Bool separator); + EAPI Eina_Bool elm_toolbar_item_separator_get(Elm_Toolbar_Item *item); EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable); /* smart callbacks called: * "clicked" - when the user clicks on a toolbar item and becomes selected |
From: Enlightenment S. <no-...@en...> - 2009-08-30 16:57:33
|
Log: Cleanup some commented out lines that were left there on last commit. Author: devilhorns Date: 2009-08-30 09:57:14 -0700 (Sun, 30 Aug 2009) New Revision: 42111 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-30 16:56:17 UTC (rev 42110) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-08-30 16:57:14 UTC (rev 42111) @@ -144,16 +144,8 @@ elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(it->base, &mw, &mh, mw, mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh); -// if (!it->separator) -// { - evas_object_size_hint_min_set(it->base, mw, mh); - evas_object_size_hint_max_set(it->base, 9999, mh); -// } -// else -// { -// evas_object_size_hint_min_set(it->base, 10, mh); -// evas_object_size_hint_max_set(it->base, 10, mh); -// } + evas_object_size_hint_min_set(it->base, mw, mh); + evas_object_size_hint_max_set(it->base, 9999, mh); } _sizing_eval(obj); } |
From: Enlightenment S. <no-...@en...> - 2009-09-04 15:39:43
|
Log: Fix some formatting. Cleanup some snprintf's. Author: devilhorns Date: 2009-09-04 08:39:30 -0700 (Fri, 04 Sep 2009) New Revision: 42247 Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_genlist.c 2009-09-04 14:18:05 UTC (rev 42246) +++ trunk/TMP/st/elementary/src/lib/elm_genlist.c 2009-09-04 15:39:30 UTC (rev 42247) @@ -600,16 +600,16 @@ if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) { if (in & 0x1) - snprintf(buf, sizeof(buf), "%s/%s", "tree_odd", it->itc->item_style); + snprintf(buf, sizeof(buf), "tree_odd/%s", it->itc->item_style); else - snprintf(buf, sizeof(buf), "%s/%s", "tree", it->itc->item_style); + snprintf(buf, sizeof(buf), "tree/%s", it->itc->item_style); } else { if (in & 0x1) - snprintf(buf, sizeof(buf), "%s/%s", "item_odd", it->itc->item_style); + snprintf(buf, sizeof(buf), "item_odd/%s", it->itc->item_style); else - snprintf(buf, sizeof(buf), "%s/%s", "item", it->itc->item_style); + snprintf(buf, sizeof(buf), "item/%s", it->itc->item_style); } _elm_theme_set(it->base, "genlist", buf, elm_widget_style_get(it->wd->obj)); it->spacer = evas_object_rectangle_add(evas_object_evas_get(it->wd->obj)); @@ -618,13 +618,17 @@ for (it2 = it, depth = 0; it2->parent; it2 = it2->parent) depth += 1; treesize = edje_object_data_get(it->base, "treesize"); if (treesize) tsize = atoi(treesize); - evas_object_size_hint_min_set(it->spacer, (depth * tsize) * _elm_config->scale, 1); + evas_object_size_hint_min_set(it->spacer, + (depth * tsize) * _elm_config->scale, 1); edje_object_part_swallow(it->base, "elm.swallow.pad", it->spacer); if (!calc) { - edje_object_signal_callback_add(it->base, "elm,action,expand,toggle", "elm", _signal_expand_toggle, it); - edje_object_signal_callback_add(it->base, "elm,action,expand", "elm", _signal_expand, it); - edje_object_signal_callback_add(it->base, "elm,action,contract", "elm", _signal_contract, it); + edje_object_signal_callback_add(it->base, "elm,action,expand,toggle", + "elm", _signal_expand_toggle, it); + edje_object_signal_callback_add(it->base, "elm,action,expand", "elm", + _signal_expand, it); + edje_object_signal_callback_add(it->base, "elm,action,contract", + "elm", _signal_contract, it); stacking = edje_object_data_get(it->base, "stacking"); if (stacking) { @@ -698,6 +702,7 @@ if (!it->mincalcd) { Evas_Coord mw = -1, mh = -1; + elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(it->base, &mw, &mh, mw, mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh); @@ -843,13 +848,12 @@ Item_Block *itb; Evas_Coord minw = -1, minh = 0, x = 0, y = 0, ow, oh; Item_Block *chb = NULL; - int in; - int minw_change = 0; + int in = 0, minw_change = 0; - in = 0; EINA_INLIST_FOREACH(wd->blocks, itb) { int showme = 0; + if (chb) { if (itb->realized) _item_block_unrealize(itb); @@ -1015,17 +1019,12 @@ 0, 0, ow, oh)) { if ((!itb->realized) || (itb->changed)) - { - _item_block_realize(itb, in, 0); - } + _item_block_realize(itb, in, 0); _item_block_position(itb, in); } else { - if (itb->realized) - { - _item_block_unrealize(itb); - } + if (itb->realized) _item_block_unrealize(itb); } in += itb->count; } @@ -1068,6 +1067,7 @@ if (!smart) { static Evas_Smart_Class sc; + evas_object_smart_clipped_smart_set(&_pan_sc); sc = _pan_sc; sc.name = "elm_genlist_pan"; @@ -1089,7 +1089,8 @@ _pan_set, _pan_get, _pan_max_get, _pan_child_size_get); - edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh); + edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), + &minw, &minh); evas_object_size_hint_min_set(obj, minw, minh); _sizing_eval(obj); @@ -1100,7 +1101,8 @@ _item_new(Widget_Data *wd, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, - void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data) + void (*func) (void *data, Evas_Object *obj, void *event_info), + const void *func_data) { Elm_Genlist_Item *it; |
From: Enlightenment S. <no-...@en...> - 2009-09-04 17:32:58
|
Log: Add traps for null widget data so we don't segfault needlessly. Author: devilhorns Date: 2009-09-04 10:32:50 -0700 (Fri, 04 Sep 2009) New Revision: 42253 Modified: trunk/TMP/st/elementary/src/lib/elm_spinner.c Modified: trunk/TMP/st/elementary/src/lib/elm_spinner.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_spinner.c 2009-09-04 17:13:54 UTC (rev 42252) +++ trunk/TMP/st/elementary/src/lib/elm_spinner.c 2009-09-04 17:32:50 UTC (rev 42253) @@ -214,6 +214,8 @@ _spin_value(void *data) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return ECORE_CALLBACK_CANCEL; + if (_value_set(data, wd->spin_speed)) _write_label(data); @@ -226,6 +228,7 @@ _val_inc_start(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = wd->step; if (wd->spin) ecore_timer_del(wd->spin); @@ -237,6 +240,7 @@ _val_inc_stop(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = 0; if (wd->spin) ecore_timer_del(wd->spin); @@ -247,6 +251,7 @@ _val_dec_start(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = -wd->step; if (wd->spin) ecore_timer_del(wd->spin); @@ -258,6 +263,7 @@ _val_dec_stop(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = 0; if (wd->spin) ecore_timer_del(wd->spin); @@ -268,6 +274,7 @@ _toggle_entry(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; if (wd->dragging) { wd->dragging = 0; |
From: Enlightenment S. <no-...@en...> - 2009-09-26 03:36:44
|
Log: Remove Whitespace. Fix formatting. Reduce register usage in the reconfigure callback by relocating variable declarations. Author: devilhorns Date: 2009-09-25 20:36:29 -0700 (Fri, 25 Sep 2009) New Revision: 42708 Modified: trunk/TMP/st/elementary/src/lib/els_box.c Modified: trunk/TMP/st/elementary/src/lib/els_box.c =================================================================== --- trunk/TMP/st/elementary/src/lib/els_box.c 2009-09-26 00:12:13 UTC (rev 42707) +++ trunk/TMP/st/elementary/src/lib/els_box.c 2009-09-26 03:36:29 UTC (rev 42708) @@ -2,28 +2,26 @@ #include "elm_priv.h" typedef struct _Smart_Data Smart_Data; -typedef struct _Box_Item Box_Item; +typedef struct _Box_Item Box_Item; struct _Smart_Data { - Evas_Coord x, y, w, h; - Evas_Object *obj; - Evas_Object *clip; - Eina_Bool changed : 1; - Eina_Bool horizontal : 1; - Eina_Bool homogenous : 1; - Eina_Bool deleting : 1; - Eina_List *items; + Evas_Coord x, y, w, h; + Evas_Object *obj, *clip; + Eina_Bool changed : 1; + Eina_Bool horizontal : 1; + Eina_Bool homogenous : 1; + Eina_Bool deleting : 1; + Eina_List *items; }; /* local subsystem functions */ -static void _smart_adopt(Smart_Data *sd, Evas_Object *obj); -static void _smart_disown(Evas_Object *obj); -static void _smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _smart_item_changed_size_hints_hook(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _smart_reconfigure(Smart_Data *sd); -static void _smart_extents_calculate(Smart_Data *sd); - +static void _smart_adopt(Smart_Data *sd, Evas_Object *obj); +static void _smart_disown(Evas_Object *obj); +static void _smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _smart_item_changed_size_hints_hook(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _smart_reconfigure(Smart_Data *sd); +static void _smart_extents_calculate(Smart_Data *sd); static void _smart_init(void); static void _smart_add(Evas_Object *obj); static void _smart_del(Evas_Object *obj); @@ -50,7 +48,7 @@ _els_smart_box_orientation_set(Evas_Object *obj, int horizontal) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; if (sd->horizontal == horizontal) return; @@ -62,7 +60,7 @@ _els_smart_box_orientation_get(Evas_Object *obj) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return 0; return sd->horizontal; @@ -72,7 +70,7 @@ _els_smart_box_homogenous_set(Evas_Object *obj, int homogenous) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; if (sd->homogenous == homogenous) return; @@ -84,7 +82,7 @@ _els_smart_box_pack_start(Evas_Object *obj, Evas_Object *child) { Smart_Data *sd; - + if (!child) return 0; sd = evas_object_smart_data_get(obj); if (!sd) return 0; @@ -98,7 +96,7 @@ _els_smart_box_pack_end(Evas_Object *obj, Evas_Object *child) { Smart_Data *sd; - + if (!child) return 0; sd = evas_object_smart_data_get(obj); if (!sd) return 0; @@ -114,10 +112,10 @@ int i = 0; const Eina_List *l; const Evas_Object *oitr; + EINA_LIST_FOREACH(sd->items, l, oitr) { - if (oitr == child) - return i; + if (oitr == child) return i; i++; } return -1; @@ -134,7 +132,6 @@ _smart_adopt(sd, child); sd->items = eina_list_prepend_relative(sd->items, child, before); _smart_reconfigure(sd); - return _els_smart_box_find(sd, child); } @@ -156,7 +153,7 @@ _els_smart_box_unpack(Evas_Object *obj, Evas_Object *child) { Smart_Data *sd; - + if (!obj) return; sd = evas_object_smart_data_get(obj); if (!sd) return; @@ -181,6 +178,7 @@ while (sd->items) { Evas_Object *child = sd->items->data; + _els_smart_box_unpack(obj, child); } } @@ -195,6 +193,7 @@ while (sd->items) { Evas_Object *child = sd->items->data; + evas_object_del(child); } } @@ -218,7 +217,7 @@ _smart_disown(Evas_Object *obj) { Smart_Data *sd; - + sd = evas_object_smart_data_get(evas_object_smart_parent_get(obj)); if (!sd) return; if (sd->items) @@ -255,12 +254,12 @@ Evas_Coord x, y, w, h, xx, yy; const Eina_List *l; Evas_Object *obj; - Evas_Coord minw, minh, wdif, hdif, mnw, mnh, mxw, mxh; - int count, expand, fw, fh, xw, xh; - double ax, ay, wx, wy; + Evas_Coord minw, minh, wdif, hdif; + int count = 0, expand = 0; + double ax, ay; _smart_extents_calculate(sd); - + x = sd->x; y = sd->y; w = sd->w; @@ -269,7 +268,6 @@ evas_object_size_hint_min_get(sd->obj, &minw, &minh); evas_object_size_hint_align_get(sd->obj, &ax, &ay); count = eina_list_count(sd->items); - expand = 0; if (w < minw) { x = x + ((w - minw) * (1.0 - ax)); @@ -282,6 +280,8 @@ } EINA_LIST_FOREACH(sd->items, l, obj) { + double wx, wy; + evas_object_size_hint_weight_get(obj, &wx, &wy); if (sd->horizontal) { @@ -312,6 +312,10 @@ yy = y; EINA_LIST_FOREACH(sd->items, l, obj) { + Evas_Coord mnw, mnh, mxw, mxh; + double wx, wy; + int fw, fh, xw, xh; + evas_object_size_hint_align_get(obj, &ax, &ay); evas_object_size_hint_weight_get(obj, &wx, &wy); evas_object_size_hint_min_get(obj, &mnw, &mnh); @@ -327,7 +331,7 @@ if (sd->homogenous) { Evas_Coord ww, hh, ow, oh; - + ww = (w / (Evas_Coord)count); hh = h; ow = mnw; @@ -347,7 +351,7 @@ else { Evas_Coord ww, hh, ow, oh; - + ww = mnw; if ((expand > 0) && (xw)) { @@ -375,7 +379,7 @@ if (sd->homogenous) { Evas_Coord ww, hh, ow, oh; - + ww = w; hh = (h / (Evas_Coord)count); ow = mnw; @@ -393,7 +397,7 @@ else { Evas_Coord ww, hh, ow, oh; - + ww = w; hh = mnh; if ((expand > 0) && (xh)) @@ -423,6 +427,8 @@ _smart_extents_calculate(Smart_Data *sd) { Evas_Coord minw, minh, maxw, maxh, mnw, mnh; + const Eina_List *l; + const Evas_Object *obj; /* FIXME: need to calc max */ minw = 0; @@ -431,8 +437,6 @@ maxh = -1; if (sd->homogenous) { - const Eina_List *l; - const Evas_Object *obj; EINA_LIST_FOREACH(sd->items, l, obj) { evas_object_size_hint_min_get(obj, &mnw, &mnh); @@ -446,8 +450,6 @@ } else { - const Eina_List *l; - const Evas_Object *obj; EINA_LIST_FOREACH(sd->items, l, obj) { evas_object_size_hint_min_get(obj, &mnw, &mnh); @@ -497,7 +499,7 @@ _smart_add(Evas_Object *obj) { Smart_Data *sd; - + sd = calloc(1, sizeof(Smart_Data)); if (!sd) return; sd->obj = obj; @@ -513,14 +515,14 @@ _smart_del(Evas_Object *obj) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; sd->deleting = EINA_TRUE; while (sd->items) { Evas_Object *child; - + child = sd->items->data; _els_smart_box_unpack(obj, child); } @@ -536,7 +538,7 @@ const Eina_List *l; Evas_Object *child; Evas_Coord dx, dy; - + sd = evas_object_smart_data_get(obj); if (!sd) return; dx = x - sd->x; @@ -556,7 +558,7 @@ _smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; sd->w = w; @@ -568,7 +570,7 @@ _smart_show(Evas_Object *obj) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; if (sd->items) evas_object_show(sd->clip); @@ -578,7 +580,7 @@ _smart_hide(Evas_Object *obj) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_hide(sd->clip); @@ -588,7 +590,7 @@ _smart_color_set(Evas_Object *obj, int r, int g, int b, int a) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_color_set(sd->clip, r, g, b, a); @@ -598,7 +600,7 @@ _smart_clip_set(Evas_Object *obj, Evas_Object *clip) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_clip_set(sd->clip, clip); @@ -608,7 +610,7 @@ _smart_clip_unset(Evas_Object *obj) { Smart_Data *sd; - + sd = evas_object_smart_data_get(obj); if (!sd) return; evas_object_clip_unset(sd->clip); |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:26:44
|
Log: Formatting. Remove unused variables. Some code cleanup. Author: devilhorns Date: 2009-09-26 10:26:32 -0700 (Sat, 26 Sep 2009) New Revision: 42712 Modified: trunk/TMP/st/elementary/src/lib/elm_toggle.c Modified: trunk/TMP/st/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toggle.c 2009-09-26 13:05:20 UTC (rev 42711) +++ trunk/TMP/st/elementary/src/lib/elm_toggle.c 2009-09-26 17:26:32 UTC (rev 42712) @@ -84,9 +84,10 @@ _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info) { Widget_Data *wd = elm_widget_data_get(data); + Evas_Coord mw, mh; + if (obj != wd->icon) return; edje_object_part_swallow(wd->tgl, "elm.swallow.content", obj); - Evas_Coord mw, mh; evas_object_size_hint_min_get(obj, &mw, &mh); _sizing_eval(data); } @@ -96,6 +97,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Object *sub = event_info; + if (sub == wd->icon) { edje_object_signal_emit(wd->tgl, "elm,state,icon,hidden", "elm"); @@ -110,6 +112,7 @@ _signal_toggle_off(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + wd->state = 0; if (wd->statep) *wd->statep = wd->state; evas_object_smart_callback_call(data, "changed", NULL); @@ -119,6 +122,7 @@ _signal_toggle_on(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + wd->state = 1; if (wd->statep) *wd->statep = wd->state; evas_object_smart_callback_call(data, "changed", NULL); @@ -145,8 +149,10 @@ _elm_theme_set(wd->tgl, "toggle", "base", "default"); wd->ontext = eina_stringshare_add("ON"); wd->offtext = eina_stringshare_add("OFF"); - edje_object_signal_callback_add(wd->tgl, "elm,action,toggle,on", "", _signal_toggle_on, obj); - edje_object_signal_callback_add(wd->tgl, "elm,action,toggle,off", "", _signal_toggle_off, obj); + edje_object_signal_callback_add(wd->tgl, "elm,action,toggle,on", "", + _signal_toggle_on, obj); + edje_object_signal_callback_add(wd->tgl, "elm,action,toggle,off", "", + _signal_toggle_off, obj); elm_widget_resize_object_set(obj, wd->tgl); edje_object_part_text_set(wd->tgl, "elm.ontext", wd->ontext); edje_object_part_text_set(wd->tgl, "elm.offtext", wd->offtext); @@ -161,21 +167,19 @@ elm_toggle_label_set(Evas_Object *obj, const char *label) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord mw, mh; if (wd->label) eina_stringshare_del(wd->label); if (label) { wd->label = eina_stringshare_add(label); edje_object_signal_emit(wd->tgl, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->tgl); } else { wd->label = NULL; edje_object_signal_emit(wd->tgl, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->tgl); } + edje_object_message_signal_process(wd->tgl); edje_object_part_text_set(wd->tgl, "elm.text", label); _sizing_eval(obj); } @@ -184,8 +188,8 @@ elm_toggle_label_get(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return NULL; - return wd->label; } @@ -193,24 +197,24 @@ elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon) { Widget_Data *wd = elm_widget_data_get(obj); + if ((wd->icon != icon) && (wd->icon)) elm_widget_sub_object_del(obj, wd->icon); wd->icon = icon; - if (icon) - { - elm_widget_sub_object_add(obj, icon); - edje_object_part_swallow(wd->tgl, "elm.swallow.content", icon); - edje_object_signal_emit(wd->tgl, "elm,state,icon,visible", "elm"); - evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - _sizing_eval(obj); - } + if (!icon) return; + elm_widget_sub_object_add(obj, icon); + edje_object_part_swallow(wd->tgl, "elm.swallow.content", icon); + edje_object_signal_emit(wd->tgl, "elm,state,icon,visible", "elm"); + evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + _sizing_eval(obj); } EAPI Evas_Object * elm_toggle_icon_get(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return NULL; return wd->icon; } @@ -219,6 +223,7 @@ elm_toggle_states_labels_set(Evas_Object *obj, const char *onlabel, const char *offlabel) { Widget_Data *wd = elm_widget_data_get(obj); + if (wd->ontext) eina_stringshare_del(wd->ontext); if (wd->offtext) eina_stringshare_del(wd->offtext); if (onlabel) wd->ontext = eina_stringshare_add(onlabel); @@ -234,6 +239,7 @@ elm_toggle_state_set(Evas_Object *obj, Eina_Bool state) { Widget_Data *wd = elm_widget_data_get(obj); + if (state != wd->state) { wd->state = state; @@ -249,6 +255,7 @@ elm_toggle_state_get(const Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + return wd->state; } @@ -270,7 +277,5 @@ } } else - { - wd->statep = NULL; - } + wd->statep = NULL; } |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:28:11
|
Log: Formatting. Author: devilhorns Date: 2009-09-26 10:28:01 -0700 (Sat, 26 Sep 2009) New Revision: 42713 Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bg.c 2009-09-26 17:26:32 UTC (rev 42712) +++ trunk/TMP/st/elementary/src/lib/elm_bg.c 2009-09-26 17:28:01 UTC (rev 42713) @@ -128,7 +128,8 @@ else { wd->custom_img = evas_object_image_add(evas_object_evas_get(wd->img)); - evas_object_event_callback_add(wd->custom_img, EVAS_CALLBACK_RESIZE, _custom_resize, wd); + evas_object_event_callback_add(wd->custom_img, EVAS_CALLBACK_RESIZE, + _custom_resize, wd); evas_object_image_file_set(wd->custom_img, file, group); } elm_widget_sub_object_add(obj, wd->custom_img); |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:36:39
|
Log: formatting Author: devilhorns Date: 2009-09-26 10:36:26 -0700 (Sat, 26 Sep 2009) New Revision: 42714 Modified: trunk/TMP/st/elementary/src/lib/elm_bubble.c Modified: trunk/TMP/st/elementary/src/lib/elm_bubble.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bubble.c 2009-09-26 17:28:01 UTC (rev 42713) +++ trunk/TMP/st/elementary/src/lib/elm_bubble.c 2009-09-26 17:36:26 UTC (rev 42714) @@ -9,7 +9,6 @@ * */ - typedef struct _Widget_Data Widget_Data; struct _Widget_Data @@ -72,20 +71,12 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Object *sub = event_info; - if (sub == wd->content) - { - evas_object_event_callback_del - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints); - wd->content = NULL; - _sizing_eval(obj); - } - else if (sub == wd->icon) - { - evas_object_event_callback_del - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints); - wd->icon = NULL; - _sizing_eval(obj); - } + + evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints); + if (sub == wd->content) wd->content = NULL; + else if (sub == wd->icon) wd->icon = NULL; + _sizing_eval(obj); } /** @@ -151,7 +142,6 @@ { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - return wd->label; } @@ -201,7 +191,8 @@ { elm_widget_sub_object_add(obj, content); edje_object_part_swallow(wd->bbl, "elm.swallow.content", content); - evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + evas_object_event_callback_add(content, + EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); } _sizing_eval(obj); @@ -256,7 +247,6 @@ elm_bubble_corner_set(Evas_Object *obj, const char *corner) { Widget_Data *wd = elm_widget_data_get(obj); - _elm_theme_set(wd->bbl, "bubble", corner, elm_widget_style_get(obj)); if (wd->icon) edje_object_part_swallow(wd->bbl, "elm.swallow.icon", wd->icon); |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:39:42
|
Log: Formatting. Author: devilhorns Date: 2009-09-26 10:39:29 -0700 (Sat, 26 Sep 2009) New Revision: 42715 Modified: trunk/TMP/st/elementary/src/lib/elm_button.c Modified: trunk/TMP/st/elementary/src/lib/elm_button.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_button.c 2009-09-26 17:36:26 UTC (rev 42714) +++ trunk/TMP/st/elementary/src/lib/elm_button.c 2009-09-26 17:39:29 UTC (rev 42715) @@ -12,8 +12,7 @@ struct _Widget_Data { - Evas_Object *btn; - Evas_Object *icon; + Evas_Object *btn, *icon; const char *label; }; @@ -70,9 +69,9 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + if (!wd) return; elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc(wd->btn, &minw, &minh, minw, minh); elm_coords_finger_size_adjust(1, &minw, 1, &minh); @@ -94,13 +93,13 @@ _sub_del(void *data, Evas_Object *obj, void *event_info) { Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; Evas_Object *sub = event_info; + if (!wd) return; if (sub == wd->icon) { edje_object_signal_emit(wd->btn, "elm,state,icon,hidden", "elm"); - evas_object_event_callback_del - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints); + evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints); wd->icon = NULL; edje_object_message_signal_process(wd->btn); _sizing_eval(obj); @@ -141,7 +140,8 @@ wd->btn = edje_object_add(e); _elm_theme_set(wd->btn, "button", "base", "default"); - edje_object_signal_callback_add(wd->btn, "elm,action,click", "", _signal_clicked, obj); + edje_object_signal_callback_add(wd->btn, "elm,action,click", "", + _signal_clicked, obj); elm_widget_resize_object_set(obj, wd->btn); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); @@ -162,22 +162,21 @@ elm_button_label_set(Evas_Object *obj, const char *label) { Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; Evas_Coord mw, mh; + if (!wd) return; if (wd->label) eina_stringshare_del(wd->label); if (label) { wd->label = eina_stringshare_add(label); edje_object_signal_emit(wd->btn, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->btn); } else { wd->label = NULL; edje_object_signal_emit(wd->btn, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->btn); } + edje_object_message_signal_process(wd->btn); edje_object_part_text_set(wd->btn, "elm.text", label); _sizing_eval(obj); } @@ -187,7 +186,6 @@ { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - return wd->label; } |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:43:42
|
Log: little bit of formatting. Author: devilhorns Date: 2009-09-26 10:43:30 -0700 (Sat, 26 Sep 2009) New Revision: 42716 Modified: trunk/TMP/st/elementary/src/lib/elm_carousel.c Modified: trunk/TMP/st/elementary/src/lib/elm_carousel.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_carousel.c 2009-09-26 17:39:29 UTC (rev 42715) +++ trunk/TMP/st/elementary/src/lib/elm_carousel.c 2009-09-26 17:43:30 UTC (rev 42716) @@ -14,10 +14,8 @@ struct _Elm_Carousel_Item { - Evas_Object *obj; - Evas_Object *base; + Evas_Object *obj, *base, *icon; const char *label; - Evas_Object *icon; void (*func) (void *data, Evas_Object *obj, void *event_info); const void *data; Eina_Bool selected : 1; @@ -45,6 +43,7 @@ Widget_Data *wd = elm_widget_data_get(it->obj); Evas_Object *obj2; const Eina_List *l; + if (it->selected) return; EINA_LIST_FOREACH(wd->items, l, it2) { @@ -76,9 +75,11 @@ Widget_Data *wd = elm_widget_data_get(obj); const Eina_List *l; const Elm_Carousel_Item *it; - Evas_Coord mw, mh; + EINA_LIST_FOREACH(wd->items, l, it) { + Evas_Coord mw, mh; + if (it->selected) edje_object_signal_emit(it->base, "elm,state,selected", "elm"); _elm_theme_set(it->base, "carousel", "item", elm_widget_style_get(obj)); @@ -194,6 +195,7 @@ Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord mw, mh; Elm_Carousel_Item *it = calloc(1, sizeof(Elm_Carousel_Item)); + if (!it) return NULL; wd->items = eina_list_append(wd->items, it); it->obj = obj; @@ -232,6 +234,7 @@ { Widget_Data *wd = elm_widget_data_get(it->obj); Evas_Object *obj2 = it->obj; + wd->items = eina_list_remove(wd->items, it); eina_stringshare_del(it->label); if (it->icon) evas_object_del(it->icon); |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:46:16
|
Log: Formatting. Remove some duplicate code. Author: devilhorns Date: 2009-09-26 10:46:05 -0700 (Sat, 26 Sep 2009) New Revision: 42717 Modified: trunk/TMP/st/elementary/src/lib/elm_check.c Modified: trunk/TMP/st/elementary/src/lib/elm_check.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_check.c 2009-09-26 17:43:30 UTC (rev 42716) +++ trunk/TMP/st/elementary/src/lib/elm_check.c 2009-09-26 17:46:05 UTC (rev 42717) @@ -23,8 +23,7 @@ struct _Widget_Data { - Evas_Object *chk; - Evas_Object *icon; + Evas_Object *chk, *icon; Eina_Bool state; Eina_Bool *statep; const char *label; @@ -113,8 +112,8 @@ if (sub == wd->icon) { edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm"); - evas_object_event_callback_del - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints); + evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints); wd->icon = NULL; _sizing_eval(obj); } @@ -180,9 +179,12 @@ wd->chk = edje_object_add(e); _elm_theme_set(wd->chk, "check", "base", "default"); - edje_object_signal_callback_add(wd->chk, "elm,action,check,on", "", _signal_check_on, obj); - edje_object_signal_callback_add(wd->chk, "elm,action,check,off", "", _signal_check_off, obj); - edje_object_signal_callback_add(wd->chk, "elm,action,check,toggle", "", _signal_check_toggle, obj); + edje_object_signal_callback_add(wd->chk, "elm,action,check,on", "", + _signal_check_on, obj); + edje_object_signal_callback_add(wd->chk, "elm,action,check,off", "", + _signal_check_off, obj); + edje_object_signal_callback_add(wd->chk, "elm,action,check,toggle", "", + _signal_check_toggle, obj); elm_widget_resize_object_set(obj, wd->chk); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); @@ -210,14 +212,13 @@ { wd->label = eina_stringshare_add(label); edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->chk); } else { wd->label = NULL; edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->chk); } + edje_object_message_signal_process(wd->chk); edje_object_part_text_set(wd->chk, "elm.text", label); _sizing_eval(obj); } @@ -235,7 +236,6 @@ { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - return wd->label; } @@ -346,7 +346,6 @@ elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep) { Widget_Data *wd = elm_widget_data_get(obj); - if (statep) { wd->statep = statep; @@ -360,7 +359,5 @@ } } else - { - wd->statep = NULL; - } + wd->statep = NULL; } |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:50:18
|
Log: Formatting. Remove unused variable(s). Author: devilhorns Date: 2009-09-26 10:50:03 -0700 (Sat, 26 Sep 2009) New Revision: 42718 Modified: trunk/TMP/st/elementary/src/lib/elm_clock.c Modified: trunk/TMP/st/elementary/src/lib/elm_clock.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_clock.c 2009-09-26 17:46:05 UTC (rev 42717) +++ trunk/TMP/st/elementary/src/lib/elm_clock.c 2009-09-26 17:50:03 UTC (rev 42718) @@ -21,13 +21,14 @@ Evas_Object *digit[6]; Evas_Object *ampm; Ecore_Timer *ticker; - struct { - int hrs, min, sec; - char ampm; - Eina_Bool seconds : 1; - Eina_Bool am_pm : 1; - Eina_Bool edit : 1; - } cur; + struct + { + int hrs, min, sec; + char ampm; + Eina_Bool seconds : 1; + Eina_Bool am_pm : 1; + Eina_Bool edit : 1; + } cur; }; static void _del_hook(Evas_Object *obj); @@ -55,7 +56,6 @@ _theme_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - int i; wd->cur.am_pm = !wd->cur.am_pm; /* hack - force update */ _time_update(obj); } @@ -64,10 +64,10 @@ _ticker(void *data) { Widget_Data *wd = elm_widget_data_get(data); - double t; - struct timeval timev; - struct tm *tm; - time_t tt; + double t; + struct timeval timev; + struct tm *tm; + time_t tt; gettimeofday(&timev, NULL); t = ((double)(1000000 - timev.tv_usec)) / 1000000.0; @@ -190,7 +190,7 @@ (wd->cur.edit != wd->edit)) { int i; - Evas_Coord mw, mh; +// Evas_Coord mw, mh; for (i = 0; i < 6; i++) { @@ -214,7 +214,8 @@ _elm_theme_set(wd->clk, "clock", "base-am_pm", style); else _elm_theme_set(wd->clk, "clock", "base", style); - edje_object_scale_set(wd->clk, elm_widget_scale_get(obj) * _elm_config->scale); + edje_object_scale_set(wd->clk, elm_widget_scale_get(obj) * + _elm_config->scale); for (i = 0; i < 6; i++) { @@ -223,7 +224,8 @@ if ((!wd->seconds) && (i >= 4)) break; wd->digit[i] = edje_object_add(evas_object_evas_get(wd->clk)); _elm_theme_set(wd->digit[i], "clock", "flipdigit", style); - edje_object_scale_set(wd->digit[i], elm_widget_scale_get(obj) * _elm_config->scale); + edje_object_scale_set(wd->digit[i], elm_widget_scale_get(obj) * + _elm_config->scale); if (wd->edit) edje_object_signal_emit(wd->digit[i], "elm,state,edit,on", "elm"); edje_object_signal_callback_add(wd->digit[i], "elm,action,up", "", @@ -243,7 +245,8 @@ { wd->ampm = edje_object_add(evas_object_evas_get(wd->clk)); _elm_theme_set(wd->ampm, "clock", "flipampm", style); - edje_object_scale_set(wd->ampm, elm_widget_scale_get(obj) * _elm_config->scale); + edje_object_scale_set(wd->ampm, elm_widget_scale_get(obj) * + _elm_config->scale); if (wd->edit) edje_object_signal_emit(wd->ampm, "elm,state,edit,on", "elm"); edje_object_signal_callback_add(wd->ampm, "elm,action,up", "", |
From: Enlightenment S. <no-...@en...> - 2009-09-26 17:51:09
|
Log: Ooops, make clock build again. Author: devilhorns Date: 2009-09-26 10:50:56 -0700 (Sat, 26 Sep 2009) New Revision: 42719 Modified: trunk/TMP/st/elementary/src/lib/elm_clock.c Modified: trunk/TMP/st/elementary/src/lib/elm_clock.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_clock.c 2009-09-26 17:50:03 UTC (rev 42718) +++ trunk/TMP/st/elementary/src/lib/elm_clock.c 2009-09-26 17:50:56 UTC (rev 42719) @@ -190,7 +190,7 @@ (wd->cur.edit != wd->edit)) { int i; -// Evas_Coord mw, mh; + Evas_Coord mw, mh; for (i = 0; i < 6; i++) { |