From: Enlightenment S. <no-...@en...> - 2009-10-15 17:37:03
|
Log: Don't need to fetch Widget_Data here as we never use it. Author: devilhorns Date: 2009-10-15 10:36:48 -0700 (Thu, 15 Oct 2009) New Revision: 43097 Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-10-15 14:07:27 UTC (rev 43096) +++ trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-10-15 17:36:48 UTC (rev 43097) @@ -55,7 +55,7 @@ static void _sizing_eval(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); + //Widget_Data *wd = elm_widget_data_get(obj); //Evas_Coord minw = -1, minh = -1; //edje_object_size_min_calc(wd->notify, &minw, &minh); |
From: Enlightenment S. <no-...@en...> - 2009-10-15 19:33:42
|
Log: Add missing function prototype. Author: devilhorns Date: 2009-10-15 12:33:28 -0700 (Thu, 15 Oct 2009) New Revision: 43099 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-10-15 19:08:06 UTC (rev 43098) +++ trunk/TMP/st/elementary/src/lib/elm_bg.c 2009-10-15 19:33:28 UTC (rev 43099) @@ -19,6 +19,7 @@ }; static void _del_hook(Evas_Object *obj); +static void _theme_hook(Evas_Object *obj); static void _custom_resize(void *data, Evas *a, Evas_Object *obj, void *event_info); static void |
From: Enlightenment S. <no-...@en...> - 2009-10-18 05:40:39
|
Log: Fix callbacks to be proper Evas_Smart_Cb's and remove compiler warnings. Author: devilhorns Date: 2009-10-17 22:40:22 -0700 (Sat, 17 Oct 2009) New Revision: 43140 Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_scroller.c 2009-10-18 04:24:57 UTC (rev 43139) +++ trunk/TMP/st/elementary/src/lib/elm_scroller.c 2009-10-18 05:40:22 UTC (rev 43140) @@ -82,6 +82,7 @@ Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord vw, vh, minw, minh, maxw, maxh, w, h, vmw, vmh; double xw, xy; + if (!wd) return; evas_object_size_hint_min_get(wd->content, &minw, &minh); evas_object_size_hint_max_get(wd->content, &maxw, &maxh); @@ -119,12 +120,13 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Object *sub = event_info; + if (!wd) return; if (sub == wd->content) { elm_widget_on_show_region_hook_set(wd->content, NULL, NULL); - 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->content = NULL; _sizing_eval(obj); } @@ -134,6 +136,7 @@ _hold_on(void *data, Evas_Object *obj, void *event_info) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; elm_smart_scroller_hold_set(wd->scr, 1); } @@ -142,6 +145,7 @@ _hold_off(void *data, Evas_Object *obj, void *event_info) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; elm_smart_scroller_hold_set(wd->scr, 0); } @@ -150,6 +154,7 @@ _freeze_on(void *data, Evas_Object *obj, void *event_info) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; elm_smart_scroller_freeze_set(wd->scr, 1); } @@ -158,6 +163,7 @@ _freeze_off(void *data, Evas_Object *obj, void *event_info) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; elm_smart_scroller_freeze_set(wd->scr, 0); } @@ -169,55 +175,55 @@ } static void -_edge_left(void *data, Evas *e, Evas_Object *obj, void *event_info) +_edge_left(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "edge,left", NULL); } static void -_edge_right(void *data, Evas *e, Evas_Object *obj, void *event_info) +_edge_right(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "edge,right", NULL); } static void -_edge_top(void *data, Evas *e, Evas_Object *obj, void *event_info) +_edge_top(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "edge,top", NULL); } static void -_edge_bottom(void *data, Evas *e, Evas_Object *obj, void *event_info) +_edge_bottom(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "edge,bottom", NULL); } static void -_scroll(void *data, Evas *e, Evas_Object *obj, void *event_info) +_scroll(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "scroll", NULL); } static void -_scroll_anim_start(void *data, Evas *e, Evas_Object *obj, void *event_info) +_scroll_anim_start(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "scroll,anim,start", NULL); } static void -_scroll_anim_stop(void *data, Evas *e, Evas_Object *obj, void *event_info) +_scroll_anim_stop(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "scroll,anim,stop", NULL); } static void -_scroll_drag_start(void *data, Evas *e, Evas_Object *obj, void *event_info) +_scroll_drag_start(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "scroll,drag,start", NULL); } static void -_scroll_drag_stop(void *data, Evas *e, Evas_Object *obj, void *event_info) +_scroll_drag_stop(void *data, Evas_Object *obj, void *event_info) { evas_object_smart_callback_call(data, "scroll,drag,stop", NULL); } |
From: Enlightenment S. <no-...@en...> - 2009-10-18 05:43:54
|
Log: Fix compiler warnings for elm_index. Use proper Evas when adding box. Author: devilhorns Date: 2009-10-17 22:43:39 -0700 (Sat, 17 Oct 2009) New Revision: 43141 Modified: trunk/TMP/st/elementary/src/lib/elm_index.c Modified: trunk/TMP/st/elementary/src/lib/elm_index.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_index.c 2009-10-18 05:40:22 UTC (rev 43140) +++ trunk/TMP/st/elementary/src/lib/elm_index.c 2009-10-18 05:43:39 UTC (rev 43141) @@ -91,7 +91,7 @@ { if (!wd->bx[1]) { - wd->bx[1] = evas_object_box_add(wd->base); + wd->bx[1] = evas_object_box_add(evas_object_evas_get(wd->base)); evas_object_box_layout_set(wd->bx[1], _layout, wd, NULL); elm_widget_sub_object_add(obj, wd->bx[1]); } @@ -350,7 +350,7 @@ selectraise = edje_object_data_get(it->base, "selectraise"); if ((selectraise) && (!strcmp(selectraise, "on"))) evas_object_raise(it->base); - evas_object_smart_callback_call((void *)obj, "changed", it->data); + evas_object_smart_callback_call((void *)obj, "changed", (void *)it->data); if (wd->delay) ecore_timer_del(wd->delay); wd->delay = ecore_timer_add(0.2, _delay_change, obj); } |
From: Enlightenment S. <no-...@en...> - 2009-10-18 05:49:30
|
Log: Don't use depreciated *style_set functions. Use elm_object_style_set Author: devilhorns Date: 2009-10-17 22:49:23 -0700 (Sat, 17 Oct 2009) New Revision: 43142 Modified: trunk/TMP/st/elementary/src/lib/elc_anchorblock.c trunk/TMP/st/elementary/src/lib/elc_anchorview.c trunk/TMP/st/elementary/src/lib/elc_hoversel.c Modified: trunk/TMP/st/elementary/src/lib/elc_anchorblock.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_anchorblock.c 2009-10-18 05:43:39 UTC (rev 43141) +++ trunk/TMP/st/elementary/src/lib/elc_anchorblock.c 2009-10-18 05:49:23 UTC (rev 43142) @@ -35,6 +35,7 @@ _del_pre_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + evas_object_event_callback_del(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints); elm_anchorblock_hover_end(obj); @@ -45,6 +46,7 @@ _del_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (wd->hover_style) eina_stringshare_del(wd->hover_style); free(wd); } @@ -70,6 +72,7 @@ _hover_del(void *data, Evas *e, Evas_Object *obj, void *event_info) { Widget_Data *wd = elm_widget_data_get(data); + wd->hover = NULL; } @@ -93,7 +96,8 @@ evas_object_resize(wd->pop, info->w, info->h); wd->hover = elm_hover_add(obj); - if (wd->hover_style) elm_hover_style_set(wd->hover, wd->hover_style); + if (wd->hover_style) + elm_object_style_set(wd->hover, wd->hover_style); hover_parent = wd->hover_parent; if (!hover_parent) hover_parent = obj; elm_hover_parent_set(wd->hover, hover_parent); Modified: trunk/TMP/st/elementary/src/lib/elc_anchorview.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_anchorview.c 2009-10-18 05:43:39 UTC (rev 43141) +++ trunk/TMP/st/elementary/src/lib/elc_anchorview.c 2009-10-18 05:49:23 UTC (rev 43142) @@ -79,7 +79,8 @@ evas_object_resize(wd->pop, info->w, info->h); wd->hover = elm_hover_add(obj); - if (wd->hover_style) elm_hover_style_set(wd->hover, wd->hover_style); + if (wd->hover_style) + elm_object_style_set(wd->hover, wd->hover_style); hover_parent = wd->hover_parent; if (!hover_parent) hover_parent = obj; elm_hover_parent_set(wd->hover, hover_parent); Modified: trunk/TMP/st/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_hoversel.c 2009-10-18 05:43:39 UTC (rev 43141) +++ trunk/TMP/st/elementary/src/lib/elc_hoversel.c 2009-10-18 05:49:23 UTC (rev 43142) @@ -79,7 +79,7 @@ if (!wd) return; snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj)); - elm_button_style_set(wd->btn, buf); + elm_object_style_set(wd->btn, buf); } static void @@ -156,7 +156,7 @@ EINA_LIST_FOREACH(wd->items, l, it) { bt = elm_button_add(wd->hover); - elm_button_style_set(bt, buf); + elm_object_style_set(bt, buf); elm_button_label_set(bt, it->label); if (it->icon_file) { @@ -227,7 +227,7 @@ elm_widget_disable_hook_set(obj, _disable_hook); wd->btn = elm_button_add(parent); - elm_button_style_set(wd->btn, "hoversel_vertical"); + elm_object_style_set(wd->btn, "hoversel_vertical"); elm_widget_resize_object_set(obj, wd->btn); evas_object_event_callback_add(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); |
From: Enlightenment S. <no-...@en...> - 2009-10-18 05:52:33
|
Log: Don't use depreciated function for setting style. Use elm_object_style_set Author: devilhorns Date: 2009-10-17 22:52:20 -0700 (Sat, 17 Oct 2009) New Revision: 43143 Modified: trunk/TMP/st/elementary/src/lib/elc_hoversel.c Modified: trunk/TMP/st/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_hoversel.c 2009-10-18 05:49:23 UTC (rev 43142) +++ trunk/TMP/st/elementary/src/lib/elc_hoversel.c 2009-10-18 05:52:20 UTC (rev 43143) @@ -143,7 +143,7 @@ wd->hover = elm_hover_add(obj); snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj)); - elm_hover_style_set(wd->hover, buf); + elm_object_style_set(wd->hover, buf); evas_object_smart_callback_add(wd->hover, "clicked", _hover_clicked, obj); elm_hover_parent_set(wd->hover, wd->hover_parent); elm_hover_target_set(wd->hover, wd->btn); |
From: Enlightenment S. <no-...@en...> - 2009-10-18 06:03:16
|
Log: Remove unused variables. Formatting. Author: devilhorns Date: 2009-10-17 23:03:03 -0700 (Sat, 17 Oct 2009) New Revision: 43144 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-10-18 05:52:20 UTC (rev 43143) +++ trunk/TMP/st/elementary/src/lib/elm_widget.c 2009-10-18 06:03:03 UTC (rev 43144) @@ -66,15 +66,13 @@ _sub_obj_del(void *data, Evas *e, Evas_Object *obj, void *event_info) { Smart_Data *sd = data; + if (obj == sd->resize_obj) - { - sd->resize_obj = NULL; - } - else if (obj == sd->hover_obj) sd->hover_obj = NULL; + sd->resize_obj = NULL; + else if (obj == sd->hover_obj) + sd->hover_obj = NULL; else - { - sd->subobjs = eina_list_remove(sd->subobjs, obj); - } + sd->subobjs = eina_list_remove(sd->subobjs, obj); evas_object_smart_callback_call(sd->obj, "sub-object-del", obj); } @@ -82,7 +80,6 @@ _sub_obj_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) { Smart_Data *sd = data; - Evas_Object *op, *op2; elm_widget_focus_steal(sd->obj); } @@ -194,6 +191,7 @@ { API_ENTRY return; double scale, pscale = elm_widget_scale_get(sobj); + sd->subobjs = eina_list_append(sd->subobjs, sobj); if (!sd->child_can_focus) { @@ -204,7 +202,8 @@ Smart_Data *sd2 = evas_object_smart_data_get(sobj); if (sd2) { - if (sd2->parent_obj) elm_widget_sub_object_del(sd2->parent_obj, sobj); + if (sd2->parent_obj) + elm_widget_sub_object_del(sd2->parent_obj, sobj); sd2->parent_obj = obj; } } @@ -243,8 +242,10 @@ Smart_Data *sd2 = evas_object_smart_data_get(sd->resize_obj); if (sd2) sd2->parent_obj = NULL; } - evas_object_event_callback_del(sd->resize_obj, EVAS_CALLBACK_DEL, _sub_obj_del); - evas_object_event_callback_del(sd->resize_obj, EVAS_CALLBACK_MOUSE_DOWN, _sub_obj_mouse_down); + evas_object_event_callback_del(sd->resize_obj, EVAS_CALLBACK_DEL, + _sub_obj_del); + evas_object_event_callback_del(sd->resize_obj, EVAS_CALLBACK_MOUSE_DOWN, + _sub_obj_mouse_down); evas_object_smart_member_del(sd->resize_obj); } sd->resize_obj = sobj; @@ -258,7 +259,8 @@ evas_object_clip_set(sobj, evas_object_clip_get(obj)); evas_object_smart_member_add(sobj, obj); evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd); - evas_object_event_callback_add(sobj, EVAS_CALLBACK_MOUSE_DOWN, _sub_obj_mouse_down, sd); + evas_object_event_callback_add(sobj, EVAS_CALLBACK_MOUSE_DOWN, + _sub_obj_mouse_down, sd); _smart_reconfigure(sd); evas_object_smart_callback_call(obj, "sub-object-add", sobj); } @@ -269,9 +271,8 @@ { API_ENTRY return; if (sd->hover_obj) - { - evas_object_event_callback_del(sd->hover_obj, EVAS_CALLBACK_DEL, _sub_obj_del); - } + evas_object_event_callback_del(sd->hover_obj, EVAS_CALLBACK_DEL, + _sub_obj_del); sd->hover_obj = sobj; if (sd->hover_obj) { @@ -309,6 +310,7 @@ const Evas_Object *subobj; const Eina_List *l; API_ENTRY return NULL; + if (!sd->focused) return NULL; EINA_LIST_FOREACH(sd->subobjs, l, subobj) { @@ -366,7 +368,8 @@ { /* the previous focused item was unfocused - so focus * the next one (that can be focused) */ - if (elm_widget_focus_jump(sd->resize_obj, forward)) return 1; + if (elm_widget_focus_jump(sd->resize_obj, forward)) + return 1; else noloop = 1; } else @@ -374,7 +377,8 @@ if (elm_widget_focus_get(sd->resize_obj)) { /* jump to the next focused item or focus this item */ - if (elm_widget_focus_jump(sd->resize_obj, forward)) return 1; + if (elm_widget_focus_jump(sd->resize_obj, forward)) + return 1; /* it returned 0 - it got to the last item and is past it */ focus_next = 1; } @@ -393,7 +397,8 @@ { /* the previous focused item was unfocused - so focus * the next one (that can be focused) */ - if (elm_widget_focus_jump(child, forward)) return 1; + if (elm_widget_focus_jump(child, forward)) + return 1; else break; } else @@ -401,7 +406,8 @@ if (elm_widget_focus_get(child)) { /* jump to the next focused item or focus this item */ - if (elm_widget_focus_jump(child, forward)) return 1; + if (elm_widget_focus_jump(child, forward)) + return 1; /* it returned 0 - it got to the last item and is past it */ focus_next = 1; } @@ -424,7 +430,8 @@ { /* the previous focused item was unfocused - so focus * the next one (that can be focused) */ - if (elm_widget_focus_jump(child, forward)) return 1; + if (elm_widget_focus_jump(child, forward)) + return 1; else break; } else @@ -432,7 +439,8 @@ if (elm_widget_focus_get(child)) { /* jump to the next focused item or focus this item */ - if (elm_widget_focus_jump(child, forward)) return 1; + if (elm_widget_focus_jump(child, forward)) + return 1; /* it returned 0 - it got to the last item and is past it */ focus_next = 1; } @@ -448,14 +456,16 @@ { /* the previous focused item was unfocused - so focus * the next one (that can be focused) */ - if (elm_widget_focus_jump(sd->resize_obj, forward)) return 1; + if (elm_widget_focus_jump(sd->resize_obj, forward)) + return 1; } else { if (elm_widget_focus_get(sd->resize_obj)) { /* jump to the next focused item or focus this item */ - if (elm_widget_focus_jump(sd->resize_obj, forward)) return 1; + if (elm_widget_focus_jump(sd->resize_obj, forward)) + return 1; /* it returned 0 - it got to the last item and is past it */ focus_next = 1; } @@ -550,9 +560,7 @@ API_ENTRY return; if (!sd->focused) return; if (elm_widget_focus_get(sd->resize_obj)) - { - elm_widget_focused_object_clear(sd->resize_obj); - } + elm_widget_focused_object_clear(sd->resize_obj); else { const Eina_List *l; @@ -576,6 +584,7 @@ { API_ENTRY return; Evas_Object *o = elm_widget_parent_get(obj); + if (sd->focused) return; if (o) _elm_widget_parent_focus(o); sd->focused = 1; @@ -588,6 +597,7 @@ { Evas_Object *parent, *o; API_ENTRY return; + if (sd->focused) return; if (sd->disabled) return; parent = obj; @@ -645,6 +655,7 @@ elm_widget_disabled_set(Evas_Object *obj, int disabled) { API_ENTRY return; + if (sd->disabled == disabled) return; sd->disabled = disabled; if (sd->focused) @@ -679,7 +690,8 @@ sd->ry = y; sd->rw = w; sd->rh = h; - if (sd->on_show_region_func) sd->on_show_region_func(sd->on_show_region_data, obj); + if (sd->on_show_region_func) + sd->on_show_region_func(sd->on_show_region_data, obj); } EAPI void @@ -781,6 +793,7 @@ { const char *old; API_ENTRY return; + old = sd->style; sd->style = eina_stringshare_add(style); if (old) eina_stringshare_del(old); @@ -995,5 +1008,3 @@ EINA_LIST_FREE(list, s) eina_stringshare_del(s); } - - |
From: Enlightenment S. <no-...@en...> - 2009-10-18 16:32:10
|
Log: Formatting. Author: devilhorns Date: 2009-10-18 09:31:53 -0700 (Sun, 18 Oct 2009) New Revision: 43151 Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-10-18 16:07:48 UTC (rev 43150) +++ trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-10-18 16:31:53 UTC (rev 43151) @@ -35,7 +35,7 @@ static void _hide(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _resize(void *data, Evas *e, Evas_Object *obj, void *event_info); - static void +static void _del_pre_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); |
From: Enlightenment S. <no-...@en...> - 2009-10-18 16:55:45
|
Log: Formatting. Author: devilhorns Date: 2009-10-18 09:55:31 -0700 (Sun, 18 Oct 2009) New Revision: 43152 Modified: trunk/TMP/st/elementary/src/lib/elm_menu.c Modified: trunk/TMP/st/elementary/src/lib/elm_menu.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_menu.c 2009-10-18 16:31:53 UTC (rev 43151) +++ trunk/TMP/st/elementary/src/lib/elm_menu.c 2009-10-18 16:55:31 UTC (rev 43152) @@ -29,13 +29,11 @@ void (*func) (void *data, Evas_Object *obj, void *event_info); const void *data; - // //if submenu Eina_Bool open; Evas_Object *hv, *bx, *location; Eina_List *items; - // }; struct _Widget_Data @@ -97,7 +95,7 @@ free(wd); } - static void +static void _theme_hook(Evas_Object *obj) { Eina_List *l, *_l, *ll = NULL; @@ -404,7 +402,7 @@ item->hv = elm_hover_add(wd->bx); elm_hover_target_set(item->hv, item->location); elm_hover_parent_set(item->hv, wd->parent); - elm_hover_style_set(item->hv, "submenu"); + elm_object_style_set(item->hv, "submenu"); item->bx = elm_box_add(wd->bx); evas_object_event_callback_add(item->bx, EVAS_CALLBACK_RESIZE, _menu_resize, item->menu); @@ -454,7 +452,7 @@ wd->hv = elm_hover_add(obj); elm_hover_parent_set(wd->hv, parent); elm_hover_target_set(wd->hv, wd->location); - elm_hover_style_set(wd->hv, "menu"); + elm_object_style_set(wd->hv, "menu"); evas_object_smart_callback_add(wd->hv, "clicked", _menu_hide, obj); wd->bx = elm_box_add(obj); @@ -597,7 +595,6 @@ return item->label; } - EAPI void elm_menu_item_icon_set(Elm_Menu_Item *item, Evas_Object *icon) { |
From: Enlightenment S. <no-...@en...> - 2009-10-18 17:00:01
|
Log: Use elm_widget_del_pre_hook_set for setting pre-delete hook on menu. Author: devilhorns Date: 2009-10-18 09:59:51 -0700 (Sun, 18 Oct 2009) New Revision: 43153 Modified: trunk/TMP/st/elementary/src/lib/elm_menu.c Modified: trunk/TMP/st/elementary/src/lib/elm_menu.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_menu.c 2009-10-18 16:55:31 UTC (rev 43152) +++ trunk/TMP/st/elementary/src/lib/elm_menu.c 2009-10-18 16:59:51 UTC (rev 43153) @@ -442,7 +442,7 @@ elm_widget_type_set(obj, "menu"); elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); - elm_widget_del_hook_set(obj, _del_pre_hook); + elm_widget_del_pre_hook_set(obj, _del_pre_hook); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); |
From: Enlightenment S. <no-...@en...> - 2009-10-18 17:20:31
|
Log: Fix more formatting, *sigh* Use ELM_NEW instead of calloc directly Author: devilhorns Date: 2009-10-18 10:20:18 -0700 (Sun, 18 Oct 2009) New Revision: 43155 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-10-18 17:20:05 UTC (rev 43154) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-10-18 17:20:18 UTC (rev 43155) @@ -81,13 +81,15 @@ _item_show(it); obj2 = it->obj; if(it->menu) - { - evas_object_show(it->o_menu); - evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE, _menu_move_resize, it); - evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOVE, _menu_move_resize, it); + { + evas_object_show(it->o_menu); + evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE, + _menu_move_resize, it); + evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOVE, + _menu_move_resize, it); - _menu_move_resize(it, NULL, NULL, NULL); - } + _menu_move_resize(it, NULL, NULL, NULL); + } if (it->func) it->func((void *)(it->data), it->obj, it); evas_object_smart_callback_call(obj2, "clicked", it); } @@ -95,20 +97,20 @@ static void _menu_hide(void *data, Evas *e, Evas_Object *obj, void *event_info) { - Elm_Toolbar_Item *it = data; - elm_toolbar_item_unselect_all(it->obj); + Elm_Toolbar_Item *it = data; + elm_toolbar_item_unselect_all(it->obj); } static void _menu_move_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) { - Elm_Toolbar_Item *it = data; - Evas_Coord x_p,y_p,x,y,w,h,x2,y2,w2,h2,bx,by,bw,bh; - Widget_Data *wd = elm_widget_data_get(it->obj); - if (!wd || !wd->menu_parent) return; - - evas_object_geometry_get(it->base, &x, &y, &w, &h); - elm_menu_move(it->o_menu, x, y+h); + Elm_Toolbar_Item *it = data; + Evas_Coord x, y, w, h; + Widget_Data *wd = elm_widget_data_get(it->obj); + + if ((!wd) || (!wd->menu_parent)) return; + evas_object_geometry_get(it->base, &x, &y, &w, &h); + elm_menu_move(it->o_menu, x, y + h); } static void @@ -125,7 +127,7 @@ edje_object_signal_emit(it->base, "elm,state,enabled", "elm"); } - static void +static void _del_pre_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); @@ -133,9 +135,7 @@ if (!wd) return; EINA_LIST_FREE(wd->items, it) - { - elm_toolbar_item_menu_set(it, 0); - } + elm_toolbar_item_menu_set(it, 0); } static void @@ -193,14 +193,13 @@ edje_object_part_text_set(it->base, "elm.text", it->label); } else - { - _elm_theme_set(it->base, "toolbar", "separator", style); - } + _elm_theme_set(it->base, "toolbar", "separator", style); + mw = mh = -1; - if(!it->separator) + if (!it->separator) elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(it->base, &mw, &mh, mw, mh); - if(!it->separator) + if (!it->separator) elm_coords_finger_size_adjust(1, &mw, 1, &mh); evas_object_size_hint_min_set(it->base, mw, mh); } @@ -220,13 +219,13 @@ edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh); evas_object_geometry_get(obj, NULL, NULL, &w, &h); - if(w<minw) w = minw; - if(h<minh) h = minh; + if (w < minw) w = minw; + if (h < minh) h = minh; evas_object_resize(wd->scr, w, h); evas_object_size_hint_min_get(wd->bx, &minw, &minh); - if(w>minw) minw = w; + if (w > minw) minw = w; evas_object_resize(wd->bx, minw, minh); elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); if (wd->scrollable) @@ -356,7 +355,7 @@ Elm_Toolbar_Item *it; if (!wd) return NULL; - it = calloc(1, sizeof(Elm_Toolbar_Item)); + it = ELM_NEW(Elm_Toolbar_Item); if (!it) return NULL; wd->items = eina_list_append(wd->items, it); it->obj = obj; @@ -495,37 +494,36 @@ EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent) { - Eina_List *l; - Elm_Toolbar_Item *it; + Eina_List *l; + Elm_Toolbar_Item *it; + Widget_Data *wd = elm_widget_data_get(obj); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if(!parent) return; - - wd->menu_parent = parent; - EINA_LIST_FOREACH(wd->items, l, it) - { + if ((!wd) || (!parent)) return; + wd->menu_parent = parent; + EINA_LIST_FOREACH(wd->items, l, it) + { if (it->o_menu) - elm_menu_parent_set(it->o_menu, wd->menu_parent); - } + elm_menu_parent_set(it->o_menu, wd->menu_parent); + } } EAPI void elm_toolbar_item_unselect_all(Evas_Object *obj) { - Eina_List *l; - Elm_Toolbar_Item *it; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - EINA_LIST_FOREACH(wd->items, l, it) - { + Eina_List *l; + Elm_Toolbar_Item *it; + Widget_Data *wd = elm_widget_data_get(obj); + + if (!wd) return; + EINA_LIST_FOREACH(wd->items, l, it) + { if (it->selected) - { - it->selected = EINA_FALSE; - edje_object_signal_emit(it->base, "elm,state,unselected", "elm"); - break; - } - } + { + it->selected = EINA_FALSE; + edje_object_signal_emit(it->base, "elm,state,unselected", "elm"); + break; + } + } } /** @@ -537,42 +535,42 @@ EAPI void elm_toolbar_align_set(Evas_Object *obj, double align) { - Eina_List *l; - Elm_Toolbar_Item *it; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + Eina_List *l; + Elm_Toolbar_Item *it; + Widget_Data *wd = elm_widget_data_get(obj); - if(wd->align != align) - evas_object_size_hint_align_set(wd->bx, align, 0.5); - + if (!wd) return; + if(wd->align != align) + evas_object_size_hint_align_set(wd->bx, align, 0.5); wd->align = align; } EAPI void elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu) { - if (!item) return; + Widget_Data *wd = elm_widget_data_get(item->obj); + + if ((!wd) || (!item)) return; if (item->menu == menu) return; item->menu = menu; - Widget_Data *wd = elm_widget_data_get(item->obj); - if (!wd) return; - if(menu) { item->o_menu = elm_menu_add(item->base); - if(wd->menu_parent) + if (wd->menu_parent) elm_menu_parent_set(item->o_menu, wd->menu_parent); - evas_object_event_callback_add(item->o_menu, EVAS_CALLBACK_HIDE, _menu_hide, item); + evas_object_event_callback_add(item->o_menu, EVAS_CALLBACK_HIDE, + _menu_hide, item); } - else if(item->o_menu) + else if (item->o_menu) { - evas_object_event_callback_del(item->o_menu, EVAS_CALLBACK_HIDE, _menu_hide); + evas_object_event_callback_del(item->o_menu, EVAS_CALLBACK_HIDE, + _menu_hide); evas_object_del(item->o_menu); } } - EAPI Evas_Object * +EAPI Evas_Object * elm_toolbar_item_menu_get(Elm_Toolbar_Item *item) { if (!item) return; @@ -581,4 +579,3 @@ elm_toolbar_item_menu_set(item, 1); return item->o_menu; } - |
From: Enlightenment S. <no-...@en...> - 2009-10-20 21:02:52
|
Log: Formatting. Reduce code size in certain places by not reproducing the same edje_object_text_set. Author: devilhorns Date: 2009-10-20 14:02:37 -0700 (Tue, 20 Oct 2009) New Revision: 43171 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-10-20 19:23:38 UTC (rev 43170) +++ trunk/TMP/st/elementary/src/lib/elm_spinner.c 2009-10-20 21:02:37 UTC (rev 43171) @@ -91,15 +91,10 @@ char buf[1024]; if (wd->label) - { - snprintf(buf, sizeof(buf), wd->label, wd->val); - edje_object_part_text_set(wd->spinner, "elm.text", buf); - } + snprintf(buf, sizeof(buf), wd->label, wd->val); else - { - snprintf(buf, sizeof(buf), "%.0f", wd->val); - edje_object_part_text_set(wd->spinner, "elm.text", buf); - } + snprintf(buf, sizeof(buf), "%.0f", wd->val); + edje_object_part_text_set(wd->spinner, "elm.text", buf); if (wd->entry_visible) { @@ -146,14 +141,14 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; + if (!wd) return; - elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc(wd->spinner, &minw, &minh, minw, minh); elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); + evas_object_size_hint_max_set(obj, -1, -1); } static void @@ -166,14 +161,14 @@ _val_set(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - double pos; + double pos = 0.0; + if (wd->val_max > wd->val_min) pos = ((wd->val - wd->val_min) / (wd->val_max - wd->val_min)); - else - pos = 0.0; if (pos < 0.0) pos = 0.0; else if (pos > 1.0) pos = 1.0; - edje_object_part_drag_value_set(wd->spinner, "elm.dragable.slider", pos, pos); + edje_object_part_drag_value_set(wd->spinner, "elm.dragable.slider", + pos, pos); } static void @@ -199,6 +194,7 @@ { Widget_Data *wd = elm_widget_data_get(data); double pos; + edje_object_part_drag_value_get(wd->spinner, "elm.dragable.slider", &pos, NULL); wd->drag_start_pos = pos; @@ -208,6 +204,7 @@ _drag_stop(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + wd->drag_start_pos = 0; edje_object_part_drag_value_set(wd->spinner, "elm.dragable.slider", 0.0, 0.0); } @@ -216,8 +213,8 @@ _hide_entry(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; - edje_object_signal_emit(wd->spinner, "elm,state,inactive", "elm"); wd->entry_visible = 0; } @@ -226,8 +223,8 @@ _reset_value(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; - _hide_entry(obj); elm_spinner_value_set(obj, wd->orig_val); } @@ -237,8 +234,8 @@ { Widget_Data *wd = elm_widget_data_get(obj); double val; + if (!wd) return; - _hide_entry(obj); val = atof(elm_entry_entry_get(wd->ent)); elm_spinner_value_set(obj, val); @@ -248,14 +245,14 @@ _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; return; } - if (elm_widget_disabled_get(data)) - return; + if (elm_widget_disabled_get(data)) return; if (wd->entry_visible) _apply_entry_value(data); else @@ -275,8 +272,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); @@ -289,6 +286,7 @@ _val_inc_start(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = wd->step; @@ -301,6 +299,7 @@ _val_inc_stop(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = 0; @@ -312,6 +311,7 @@ _val_dec_start(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = -wd->step; @@ -324,6 +324,7 @@ _val_dec_stop(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; wd->interval = 0.85; wd->spin_speed = 0; @@ -335,6 +336,7 @@ _button_inc_start(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; if (wd->entry_visible) { @@ -348,6 +350,7 @@ _button_inc_stop(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; _val_inc_stop(data); } @@ -356,6 +359,7 @@ _button_dec_start(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; if (wd->entry_visible) { @@ -369,6 +373,7 @@ _button_dec_stop(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; _val_dec_stop(data); } @@ -384,6 +389,7 @@ { Evas_Event_Key_Down *ev = event_info; Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (!strcmp(ev->keyname, "Up")) @@ -397,6 +403,7 @@ { Evas_Event_Key_Down *ev = event_info; Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (!strcmp(ev->keyname, "Up")) @@ -443,25 +450,37 @@ _elm_theme_set(wd->spinner, "spinner", "base", "default"); elm_widget_resize_object_set(obj, wd->spinner); edje_object_signal_callback_add(wd->spinner, "drag", "*", _drag, obj); - edje_object_signal_callback_add(wd->spinner, "drag,start", "*", _drag_start, obj); - edje_object_signal_callback_add(wd->spinner, "drag,stop", "*", _drag_stop, obj); - edje_object_signal_callback_add(wd->spinner, "drag,step", "*", _drag_stop, obj); - edje_object_signal_callback_add(wd->spinner, "drag,page", "*", _drag_stop, obj); + edje_object_signal_callback_add(wd->spinner, "drag,start", "*", + _drag_start, obj); + edje_object_signal_callback_add(wd->spinner, "drag,stop", "*", + _drag_stop, obj); + edje_object_signal_callback_add(wd->spinner, "drag,step", "*", + _drag_stop, obj); + edje_object_signal_callback_add(wd->spinner, "drag,page", "*", + _drag_stop, obj); - edje_object_signal_callback_add(wd->spinner, "elm,action,increment,start", "*", _button_inc_start, obj); - edje_object_signal_callback_add(wd->spinner, "elm,action,increment,stop", "*", _button_inc_stop, obj); - edje_object_signal_callback_add(wd->spinner, "elm,action,decrement,start", "*", _button_dec_start, obj); - edje_object_signal_callback_add(wd->spinner, "elm,action,decrement,stop", "*", _button_dec_stop, obj); - edje_object_part_drag_value_set(wd->spinner, "elm.dragable.slider", 0.0, 0.0); + edje_object_signal_callback_add(wd->spinner, "elm,action,increment,start", + "*", _button_inc_start, obj); + edje_object_signal_callback_add(wd->spinner, "elm,action,increment,stop", + "*", _button_inc_stop, obj); + edje_object_signal_callback_add(wd->spinner, "elm,action,decrement,start", + "*", _button_dec_start, obj); + edje_object_signal_callback_add(wd->spinner, "elm,action,decrement,stop", + "*", _button_dec_stop, obj); + edje_object_part_drag_value_set(wd->spinner, "elm.dragable.slider", + 0.0, 0.0); - evas_object_event_callback_add(wd->spinner, EVAS_CALLBACK_KEY_DOWN, _entry_event_key_down, obj); - evas_object_event_callback_add(wd->spinner, EVAS_CALLBACK_KEY_UP, _entry_event_key_up, obj); + evas_object_event_callback_add(wd->spinner, EVAS_CALLBACK_KEY_DOWN, + _entry_event_key_down, obj); + evas_object_event_callback_add(wd->spinner, EVAS_CALLBACK_KEY_UP, + _entry_event_key_up, obj); wd->ent = elm_entry_add(obj); elm_entry_single_line_set(wd->ent, 1); evas_object_smart_callback_add(wd->ent, "activated", _entry_activated, obj); edje_object_part_swallow(wd->spinner, "elm.swallow.entry", wd->ent); - edje_object_signal_callback_add(wd->spinner, "elm,action,entry,toggle", "*", _toggle_entry, obj); + edje_object_signal_callback_add(wd->spinner, "elm,action,entry,toggle", + "*", _toggle_entry, obj); _write_label(obj); _sizing_eval(obj); @@ -485,6 +504,7 @@ elm_spinner_label_format_set(Evas_Object *obj, const char *fmt) { Widget_Data *wd = elm_widget_data_get(obj); + if (wd->label) eina_stringshare_del(wd->label); wd->label = eina_stringshare_add(fmt); _write_label(obj); @@ -503,8 +523,8 @@ elm_spinner_label_format_get(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return NULL; - return wd->label; } @@ -523,6 +543,7 @@ elm_spinner_min_max_set(Evas_Object *obj, double min, double max) { Widget_Data *wd = elm_widget_data_get(obj); + if ((wd->val_min == min) && (wd->val_max == max)) return; wd->val_min = min; wd->val_max = max; @@ -559,6 +580,7 @@ elm_spinner_value_set(Evas_Object *obj, double val) { Widget_Data *wd = elm_widget_data_get(obj); + if (wd->val == val) return; wd->val = val; if (wd->val < wd->val_min) wd->val = wd->val_min; |
From: Enlightenment S. <no-...@en...> - 2009-10-20 21:36:12
|
Log: Remove unused variables. Author: devilhorns Date: 2009-10-20 14:35:57 -0700 (Tue, 20 Oct 2009) New Revision: 43172 Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-10-20 21:02:37 UTC (rev 43171) +++ trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-10-20 21:35:57 UTC (rev 43172) @@ -117,7 +117,7 @@ _calc(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; Evas_Coord x, y, w, h; evas_object_geometry_get(obj, &x, &y, &w, &h); |
From: Enlightenment S. <no-...@en...> - 2009-10-20 22:23:40
|
Log: Getting closer to a usable panel :) Author: devilhorns Date: 2009-10-20 15:23:23 -0700 (Tue, 20 Oct 2009) New Revision: 43174 Modified: trunk/TMP/st/elementary/src/lib/elm_panel.c Modified: trunk/TMP/st/elementary/src/lib/elm_panel.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_panel.c 2009-10-20 22:22:24 UTC (rev 43173) +++ trunk/TMP/st/elementary/src/lib/elm_panel.c 2009-10-20 22:23:23 UTC (rev 43174) @@ -1,6 +1,8 @@ #include <Elementary.h> #include "elm_priv.h" +#define PNL_BTN_WIDTH 32 + /** * @defgroup Panel Panel * @@ -10,19 +12,30 @@ typedef struct _Widget_Data Widget_Data; struct _Widget_Data { - Evas_Object *parent, *panel, *btn, *icn; + Evas_Object *parent, *panel, *content; Elm_Panel_Orient orient; + Eina_Bool hidden : 1; int timeout; Ecore_Timer *timer; }; +static void _del_pre_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj); static void _theme_hook(Evas_Object *obj); static void _sizing_eval(Evas_Object *obj); static void _parent_resize(void *data, Evas *evas, Evas_Object *obj, void *event); -static void _btn_click(void *data, Evas_Object *obj, void *event); +static void _toggle_panel(void *data, Evas_Object *obj, const char *emission, const char *source); static void +_del_pre_hook(Evas_Object *obj) +{ + Widget_Data *wd = elm_widget_data_get(obj); + + evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, + _parent_resize, obj); +} + +static void _del_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); @@ -46,25 +59,28 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord x, y, w, h; + Evas_Coord pw, ph; evas_object_geometry_get(wd->parent, &x, &y, &w, &h); + edje_object_size_min_calc(wd->panel, &pw, &ph); + if (pw < 64) pw = 64; switch (wd->orient) { case ELM_PANEL_ORIENT_TOP: evas_object_move(wd->panel, x, y); - evas_object_resize(wd->panel, w, 48); + evas_object_resize(wd->panel, w, pw + PNL_BTN_WIDTH); break; case ELM_PANEL_ORIENT_BOTTOM: - evas_object_move(wd->panel, x, h - 48); - evas_object_resize(wd->panel, w, 48); + evas_object_move(wd->panel, x, h - (pw + PNL_BTN_WIDTH)); + evas_object_resize(wd->panel, w, pw + PNL_BTN_WIDTH); break; case ELM_PANEL_ORIENT_LEFT: evas_object_move(wd->panel, x, y); - evas_object_resize(wd->panel, 48, h); + evas_object_resize(wd->panel, pw + PNL_BTN_WIDTH, h); break; case ELM_PANEL_ORIENT_RIGHT: - evas_object_move(wd->panel, (x + w - 48), y); - evas_object_resize(wd->panel, 48, h); + evas_object_move(wd->panel, (x + w - (pw + PNL_BTN_WIDTH)), y); + evas_object_resize(wd->panel, pw + PNL_BTN_WIDTH, h); break; } } @@ -76,11 +92,21 @@ } static void -_btn_click(void *data, Evas_Object *obj, void *event) +_toggle_panel(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); - elm_icon_standard_set(wd->icn, "arrow_right"); + if (wd->timer) ecore_timer_del(wd->timer); + if (wd->hidden) + { + edje_object_signal_emit(wd->panel, "elm,state,visible", "elm"); + wd->hidden = EINA_FALSE; + } + else + { + edje_object_signal_emit(wd->panel, "elm,state,hidden", "elm"); + wd->hidden = EINA_TRUE; + } } EAPI Evas_Object * @@ -92,12 +118,15 @@ wd = ELM_NEW(Widget_Data); wd->parent = parent; + wd->hidden = EINA_FALSE; + wd->timeout = 2; evas = evas_object_evas_get(parent); obj = elm_widget_add(evas); elm_widget_type_set(obj, "panel"); elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); + elm_widget_del_pre_hook_set(obj, _del_pre_hook); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); @@ -105,19 +134,8 @@ elm_panel_orient_set(obj, ELM_PANEL_ORIENT_LEFT); elm_widget_resize_object_set(obj, wd->panel); - wd->icn = elm_icon_add(obj); - elm_icon_standard_set(wd->icn, "arrow_left"); - evas_object_size_hint_aspect_set(wd->icn, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - elm_widget_sub_object_add(obj, wd->icn); - - wd->btn = elm_button_add(obj); - elm_button_icon_set(wd->btn, wd->icn); - elm_object_style_set(wd->btn, "anchor"); - evas_object_size_hint_align_set(wd->btn, 0.0, 0.0); - elm_widget_sub_object_add(obj, wd->btn); - evas_object_smart_callback_add(wd->btn, "clicked", _btn_click, obj); - edje_object_part_swallow(wd->panel, "elm.swallow.arrow", wd->btn); - + edje_object_signal_callback_add(wd->panel, "elm,action,panel,toggle", + "*", _toggle_panel, obj); evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, obj); @@ -156,3 +174,19 @@ wd->timeout = timeout; // _timer_init(obj); } + +EAPI void +elm_panel_content_set(Evas_Object *obj, Evas_Object *content) +{ + Widget_Data *wd = elm_widget_data_get(obj); + + if (wd->content) + elm_widget_sub_object_del(obj, wd->content); + if (content) + { + elm_widget_sub_object_add(obj, content); + edje_object_part_swallow(wd->panel, "elm.swallow.content", content); + wd->content = content; + _sizing_eval(obj); + } +} |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:33:08
|
Log: Remove 2 useless variables. Author: devilhorns Date: 2009-11-09 04:32:10 -0800 (Mon, 09 Nov 2009) New Revision: 43574 Modified: trunk/TMP/st/elementary/src/lib/elm_frame.c Modified: trunk/TMP/st/elementary/src/lib/elm_frame.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_frame.c 2009-11-09 12:15:28 UTC (rev 43573) +++ trunk/TMP/st/elementary/src/lib/elm_frame.c 2009-11-09 12:32:10 UTC (rev 43574) @@ -46,10 +46,10 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; edje_object_size_min_calc(wd->frm, &minw, &minh); evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); + evas_object_size_hint_max_set(obj, -1, -1); } static void |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:42:50
|
Log: Remove 2 useless variables. Author: devilhorns Date: 2009-11-09 04:42:35 -0800 (Mon, 09 Nov 2009) New Revision: 43575 Modified: trunk/TMP/st/elementary/src/lib/elm_layout.c Modified: trunk/TMP/st/elementary/src/lib/elm_layout.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_layout.c 2009-11-09 12:32:10 UTC (rev 43574) +++ trunk/TMP/st/elementary/src/lib/elm_layout.c 2009-11-09 12:42:35 UTC (rev 43575) @@ -59,11 +59,11 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; edje_object_size_min_calc(wd->lay, &minw, &minh); evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); + evas_object_size_hint_max_set(obj, -1, -1); } static void |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:46:43
|
Log: Formatting. Author: devilhorns Date: 2009-11-09 04:46:31 -0800 (Mon, 09 Nov 2009) New Revision: 43576 Modified: trunk/TMP/st/elementary/src/lib/elm_menu.c Modified: trunk/TMP/st/elementary/src/lib/elm_menu.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_menu.c 2009-11-09 12:42:35 UTC (rev 43575) +++ trunk/TMP/st/elementary/src/lib/elm_menu.c 2009-11-09 12:46:31 UTC (rev 43576) @@ -62,7 +62,6 @@ evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, obj); } - static void _del_hook(Evas_Object *obj) { @@ -176,7 +175,6 @@ } } - static void _submenu_sizing_eval(Elm_Menu_Item *parent) { @@ -264,7 +262,6 @@ _submenu_sizing_eval(item); } - static void _hover_clicked_cb(void *data, Evas_Object *obj, void *event_info) { @@ -304,7 +301,6 @@ } } - static void _menu_item_select(void *data, Evas_Object *obj, const char *emission, const char *source) { @@ -353,9 +349,9 @@ _submenu_open(void *data, Evas_Object *obj, const char *emission, const char *source) { Elm_Menu_Item *it = data; + it->open = EINA_TRUE; evas_object_show(it->hv); - _sizing_eval(it->menu); } @@ -423,7 +419,6 @@ evas_object_event_callback_add(item->bx, EVAS_CALLBACK_RESIZE, _menu_resize, item->menu); } - /** * Add a new menu to the parent * |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:50:27
|
Log: Formatting. Author: devilhorns Date: 2009-11-09 04:50:16 -0800 (Mon, 09 Nov 2009) New Revision: 43577 Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-11-09 12:46:31 UTC (rev 43576) +++ trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-11-09 12:50:16 UTC (rev 43577) @@ -84,8 +84,8 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord x,y,w,h; - if(!wd->parent) return ; + if (!wd->parent) return; evas_object_geometry_get(wd->parent, &x, &y, &w, &h); evas_object_resize(obj, w, h); evas_object_move(obj, x, y); @@ -166,7 +166,6 @@ } } - static int _timer_cb(void *data) { @@ -287,11 +286,10 @@ if(wd->content) { evas_object_event_callback_del_full(wd->content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->content, - EVAS_CALLBACK_RESIZE, - _content_resize, obj); + EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->content, EVAS_CALLBACK_RESIZE, + _content_resize, obj); evas_object_del(wd->content); wd->content = NULL; } @@ -303,11 +301,10 @@ edje_object_part_swallow(wd->notify, "elm.swallow.content", content); evas_object_event_callback_add(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - evas_object_event_callback_add(content, - EVAS_CALLBACK_RESIZE, - _content_resize, obj); + EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE, + _content_resize, obj); _sizing_eval(obj); } _calc(obj); @@ -329,20 +326,16 @@ if(wd->parent) { evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_RESIZE, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_MOVE, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_DEL, - _parent_del, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_HIDE, - _parent_hide, obj); + EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_MOVE, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, + _parent_del, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_HIDE, + _parent_hide, obj); wd->parent = NULL; } @@ -353,17 +346,13 @@ evas_object_event_callback_add(parent, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_RESIZE, + evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE, _changed_size_hints, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_MOVE, + evas_object_event_callback_add(parent, EVAS_CALLBACK_MOVE, _changed_size_hints, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_DEL, + evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL, _parent_del, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_HIDE, + evas_object_event_callback_add(parent, EVAS_CALLBACK_HIDE, _parent_hide, obj); _sizing_eval(obj); } @@ -469,8 +458,6 @@ elm_widget_resize_object_set(obj,wd->block_events); } else - { - evas_object_del(wd->block_events); - } + evas_object_del(wd->block_events); } |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:54:56
|
Log: Formatting. Remove useless variables. Use ELM_NEW instead of calloc directly. Author: devilhorns Date: 2009-11-09 04:54:44 -0800 (Mon, 09 Nov 2009) New Revision: 43578 Modified: trunk/TMP/st/elementary/src/lib/elm_pager.c Modified: trunk/TMP/st/elementary/src/lib/elm_pager.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_pager.c 2009-11-09 12:50:16 UTC (rev 43577) +++ trunk/TMP/st/elementary/src/lib/elm_pager.c 2009-11-09 12:54:44 UTC (rev 43578) @@ -47,6 +47,7 @@ _del_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + free(wd); } @@ -56,8 +57,10 @@ Widget_Data *wd = elm_widget_data_get(obj); Eina_List *l; Item *it; + EINA_LIST_FOREACH(wd->stack, 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); _sizing_eval(obj); } @@ -65,25 +68,25 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; Eina_List *l; Item *it; + EINA_LIST_FOREACH(wd->stack, l, it) { if (it->minw > minw) minw = it->minw; if (it->minh > minh) minh = it->minh; } evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); + evas_object_size_hint_max_set(obj, -1, -1); } static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info) { Item *it = data; - Evas_Coord minw = -1, minh = -1; - + evas_object_size_hint_min_get(it->content, &minw, &minh); // FIXME: why is this needed? how does edje get this unswallowed or // lose its callbacks to edje @@ -97,6 +100,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); Item *it, *ittop; + if (!wd->stack) return; ittop = eina_list_last(wd->stack)->data; if (ittop != wd->top) @@ -135,6 +139,7 @@ Evas_Coord x, y; Eina_List *l; Item *it; + evas_object_geometry_get(obj, &x, &y, NULL, NULL); EINA_LIST_FOREACH(wd->stack, l, it) evas_object_move(it->base, x, y); @@ -147,13 +152,14 @@ Evas_Object *sub = event_info; Eina_List *l; Item *it; + EINA_LIST_FOREACH(wd->stack, l, it) { if (it->content == sub) { wd->stack = eina_list_remove_list(wd->stack, l); evas_object_event_callback_del_full - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, it); + (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, it); evas_object_del(it->base); _eval_top(it->obj); free(it); @@ -169,6 +175,7 @@ Evas_Coord w, h; Eina_List *l; Item *it; + evas_object_geometry_get(obj, NULL, NULL, &w, &h); EINA_LIST_FOREACH(wd->stack, l, it) evas_object_resize(it->base, w, h); @@ -179,14 +186,12 @@ { Item *it = data; Evas_Object *obj2 = it->obj; + evas_object_hide(it->base); edje_object_signal_emit(it->base, "elm,action,reset", "elm"); evas_object_smart_callback_call(obj2, "hide,finished", it->content); edje_object_message_signal_process(it->base); - if (it->popme) - { - evas_object_del(it->content); - } + if (it->popme) evas_object_del(it->content); _sizing_eval(obj2); } @@ -247,8 +252,9 @@ elm_pager_content_push(Evas_Object *obj, Evas_Object *content) { Widget_Data *wd = elm_widget_data_get(obj); - Item *it = calloc(1, sizeof(Item)); + Item *it = ELM_NEW(Item); Evas_Coord x, y, w, h; + if (!it) return; it->obj = obj; it->content = content; @@ -261,7 +267,8 @@ elm_widget_sub_object_add(obj, it->base); elm_widget_sub_object_add(obj, it->content); _elm_theme_set(it->base, "pager", "base", elm_widget_style_get(obj)); - edje_object_signal_callback_add(it->base, "elm,action,hide,finished", "", _signal_hide_finished, it); + edje_object_signal_callback_add(it->base, "elm,action,hide,finished", "", + _signal_hide_finished, it); edje_object_part_swallow(it->base, "elm.swallow.content", it->content); evas_object_event_callback_add(it->content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, @@ -290,6 +297,7 @@ Widget_Data *wd = elm_widget_data_get(obj); Eina_List *ll; Item *it; + if (!wd->stack) return; it = eina_list_last(wd->stack)->data; it->popme = EINA_TRUE; @@ -339,6 +347,7 @@ Widget_Data *wd = elm_widget_data_get(obj); Eina_List *l; Item *it; + EINA_LIST_FOREACH(wd->stack, l, it) { if (it->content == content) @@ -364,6 +373,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); Item *it; + if (!wd->stack) return NULL; it = wd->stack->data; return it->content; @@ -382,6 +392,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); Item *it; + if (!wd->stack) return NULL; it = eina_list_last(wd->stack)->data; return it->content; |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:56:00
|
Log: Remove 2 useless variables. Author: devilhorns Date: 2009-11-09 04:55:50 -0800 (Mon, 09 Nov 2009) New Revision: 43579 Modified: trunk/TMP/st/elementary/src/lib/elm_progressbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_progressbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_progressbar.c 2009-11-09 12:54:44 UTC (rev 43578) +++ trunk/TMP/st/elementary/src/lib/elm_progressbar.c 2009-11-09 12:55:50 UTC (rev 43579) @@ -110,11 +110,11 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; edje_object_size_min_restricted_calc(wd->progressbar, &minw, &minh, minw, minh); evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); + evas_object_size_hint_max_set(obj, -1, -1); } static void |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:56:41
|
Log: Remove useless variables. Author: devilhorns Date: 2009-11-09 04:56:26 -0800 (Mon, 09 Nov 2009) New Revision: 43580 Modified: trunk/TMP/st/elementary/src/lib/elm_radio.c Modified: trunk/TMP/st/elementary/src/lib/elm_radio.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_radio.c 2009-11-09 12:55:50 UTC (rev 43579) +++ trunk/TMP/st/elementary/src/lib/elm_radio.c 2009-11-09 12:56:26 UTC (rev 43580) @@ -111,13 +111,13 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; elm_coords_finger_size_adjust(1, &minw, 1, &minh); edje_object_size_min_restricted_calc(wd->chk, &minw, &minh, minw, minh); elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); + evas_object_size_hint_max_set(obj, -1, -1); } static void |
From: Enlightenment S. <no-...@en...> - 2009-11-09 12:58:14
|
Log: More panel work. (Not complete yet). Add some doxy. Author: devilhorns Date: 2009-11-09 04:58:01 -0800 (Mon, 09 Nov 2009) New Revision: 43581 Modified: trunk/TMP/st/elementary/src/lib/elm_panel.c Modified: trunk/TMP/st/elementary/src/lib/elm_panel.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_panel.c 2009-11-09 12:56:26 UTC (rev 43580) +++ trunk/TMP/st/elementary/src/lib/elm_panel.c 2009-11-09 12:58:01 UTC (rev 43581) @@ -23,14 +23,16 @@ static void _sizing_eval(Evas_Object *obj); static void _parent_resize(void *data, Evas *evas, Evas_Object *obj, void *event); static void _toggle_panel(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _changed_size_hints(void *data, Evas *evas, Evas_Object *obj, void *event); +static void _sub_del(void *data, Evas_Object *obj, void *event); static void _del_pre_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, - _parent_resize, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, + _parent_resize, obj); } static void @@ -47,8 +49,13 @@ Widget_Data *wd = elm_widget_data_get(obj); _elm_theme_set(wd->panel, "panel", "base", "default"); + if (wd->content) + edje_object_part_swallow(wd->panel, "elm.swallow.content", wd->content); edje_object_scale_set(wd->panel, elm_widget_scale_get(obj) * _elm_config->scale); + + edje_object_signal_emit(wd->panel, "elm,action,show", "elm"); + edje_object_message_signal_process(wd->panel); _sizing_eval(obj); } @@ -61,7 +68,8 @@ evas_object_geometry_get(wd->parent, &x, &y, &w, &h); edje_object_size_min_calc(wd->panel, &pw, &ph); - if (pw < 64) pw = 64; + printf("Panel Min Size: %d %d\n", pw, ph); +// if (pw < 64) pw = 64; switch (wd->orient) { case ELM_PANEL_ORIENT_TOP: @@ -102,6 +110,39 @@ } } +static void +_changed_size_hints(void *data, Evas *evas, Evas_Object *obj, void *event) +{ + Widget_Data *wd = elm_widget_data_get(data); + + if (wd->content) + edje_object_part_swallow(wd->panel, "elm.swallow.content", wd->content); + _sizing_eval(data); +} + +static void +_sub_del(void *data, Evas_Object *obj, void *event) +{ + Widget_Data *wd = elm_widget_data_get(obj); + Evas_Object *sub = event; + + if (sub == wd->content) + { + evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + wd->content = NULL; + _sizing_eval(obj); + } +} + +/** + * Add a new panel to the parent + * + * @param parent The parent object + * @return The new object or NULL if it cannot be created + * + * @ingroup Panel + */ EAPI Evas_Object * elm_panel_add(Evas_Object *parent) { @@ -131,11 +172,20 @@ evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, obj); - edje_object_signal_emit(wd->panel, "elm,action,show", "elm"); + evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); + _sizing_eval(obj); return obj; } +/** + * Set the panel orientation + * + * @param obj The panel object + * @param orient The orientation to set for this panel object + * + * @ingroup Panel + */ EAPI void elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient) { @@ -160,18 +210,29 @@ _sizing_eval(obj); } +/** + * Set the panel content + * + * @param obj The panel object + * @param content The content will be filled in this panel object + * + * @ingroup Panel + */ EAPI void elm_panel_content_set(Evas_Object *obj, Evas_Object *content) { Widget_Data *wd = elm_widget_data_get(obj); - if (wd->content) + if ((wd->content != content) && (wd->content)) elm_widget_sub_object_del(obj, wd->content); + wd->content = content; if (content) { elm_widget_sub_object_add(obj, content); edje_object_part_swallow(wd->panel, "elm.swallow.content", content); - wd->content = content; + evas_object_event_callback_add(content, + EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); _sizing_eval(obj); } } |
From: Enlightenment S. <no-...@en...> - 2009-11-09 13:14:16
|
Log: Use EVAS_HINT_EXPAND/EVAS_HINT_FILL. Author: devilhorns Date: 2009-11-09 05:14:05 -0800 (Mon, 09 Nov 2009) New Revision: 43583 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-11-09 13:04:41 UTC (rev 43582) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-11-09 13:14:05 UTC (rev 43583) @@ -386,8 +386,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); - evas_object_size_hint_weight_set(it->base, -1.0, 1.0); - evas_object_size_hint_align_set(it->base, 0.5, -1.0); + evas_object_size_hint_weight_set(it->base, -1.0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(it->base, 0.5, EVAS_HINT_FILL); evas_object_size_hint_min_set(it->base, mw, mh); evas_object_box_append(wd->bx, it->base); evas_object_show(it->base); |
From: Enlightenment S. <no-...@en...> - 2009-11-10 02:04:06
|
Log: Formatting. Use EVAS_HINT_EXPAND/FILL. Remove unused variables. Reduce duplicated code. Author: devilhorns Date: 2009-11-09 18:03:52 -0800 (Mon, 09 Nov 2009) New Revision: 43598 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-11-09 23:48:26 UTC (rev 43597) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-11-10 02:03:52 UTC (rev 43598) @@ -28,7 +28,6 @@ Eina_Bool selected : 1; Eina_Bool disabled : 1; Eina_Bool separator : 1; - Eina_Bool menu; Evas_Object *o_menu; }; @@ -108,8 +107,7 @@ Evas_Coord x,y,w,h; Widget_Data *wd = elm_widget_data_get(it->obj); - if (!wd || !wd->menu_parent) return; - + if ((!wd) || (!wd->menu_parent)) return; evas_object_geometry_get(it->base, &x, &y, &w, &h); elm_menu_move(it->o_menu, x, y+h); } @@ -211,7 +209,7 @@ _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; + Evas_Coord minw = -1, minh = -1; Evas_Coord vw = 0, vh = 0; Evas_Coord w, h; @@ -230,17 +228,12 @@ evas_object_resize(wd->bx, minw, minh); elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); if (wd->scrollable) - { - minw = w - vw; - minh = minh + (h - vh); - } + minw = w - vw; else - { - minw = minw + (w - vw); - minh = minh + (h - vh); - } + minw = minw + (w - vw); + minh = minh + (h - vh); evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); + evas_object_size_hint_max_set(obj, -1, -1); } static void @@ -412,18 +405,18 @@ EAPI void elm_toolbar_item_label_set(Elm_Toolbar_Item *item, const char *label) { - Evas_Coord mw, mh; + Evas_Coord mw = -1, mh = -1; + 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); - mw = mh = -1; elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(item->base, &mw, &mh, mw, mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh); - evas_object_size_hint_weight_set(item->base, -1.0, 1.0); - evas_object_size_hint_align_set(item->base, 0.5, -1.0); + evas_object_size_hint_weight_set(item->base, -1.0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(item->base, 0.5, EVAS_HINT_FILL); evas_object_size_hint_min_set(item->base, mw, mh); } |
From: Enlightenment S. <no-...@en...> - 2009-11-10 04:27:08
|
Log: Formatting. Author: devilhorns Date: 2009-11-09 20:26:51 -0800 (Mon, 09 Nov 2009) New Revision: 43599 Modified: trunk/TMP/st/elementary/src/lib/elm_box.c Modified: trunk/TMP/st/elementary/src/lib/elm_box.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_box.c 2009-11-10 02:03:52 UTC (rev 43598) +++ trunk/TMP/st/elementary/src/lib/elm_box.c 2009-11-10 04:26:51 UTC (rev 43599) @@ -30,7 +30,6 @@ static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _sub_del(void *data, Evas_Object *obj, void *event_info); - static void _del_pre_hook(Evas_Object *obj) { @@ -40,8 +39,6 @@ (wd->box, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); } - - static void _del_hook(Evas_Object *obj) { |