From: Enlightenment S. <no-...@en...> - 2011-03-12 05:00:28
|
Log: elementary / els_pan - added minor exceptions. Author: hermet Date: 2011-03-11 21:00:18 -0800 (Fri, 11 Mar 2011) New Revision: 57700 Trac: http://trac.enlightenment.org/e/changeset/57700 Modified: trunk/elementary/src/lib/els_pan.c Modified: trunk/elementary/src/lib/els_pan.c =================================================================== --- trunk/elementary/src/lib/els_pan.c 2011-03-11 23:03:46 UTC (rev 57699) +++ trunk/elementary/src/lib/els_pan.c 2011-03-12 05:00:18 UTC (rev 57700) @@ -220,35 +220,40 @@ _smart_show(Evas_Object *obj) { INTERNAL_ENTRY; - evas_object_show(sd->child_obj); + if (sd->child_obj) + evas_object_show(sd->child_obj); } static void _smart_hide(Evas_Object *obj) { INTERNAL_ENTRY; - evas_object_hide(sd->child_obj); + if (sd->child_obj) + evas_object_hide(sd->child_obj); } static void _smart_color_set(Evas_Object *obj, int r, int g, int b, int a) { INTERNAL_ENTRY; - evas_object_color_set(sd->child_obj, r, g, b, a); + if (sd->child_obj) + evas_object_color_set(sd->child_obj, r, g, b, a); } static void _smart_clip_set(Evas_Object *obj, Evas_Object *clip) { INTERNAL_ENTRY; - evas_object_clip_set(sd->child_obj, clip); + if (sd->child_obj) + evas_object_clip_set(sd->child_obj, clip); } static void _smart_clip_unset(Evas_Object *obj) { INTERNAL_ENTRY; - evas_object_clip_unset(sd->child_obj); + if (sd->child_obj) + evas_object_clip_unset(sd->child_obj); } /* never need to touch this */ |
From: Enlightenment S. <no-...@en...> - 2011-03-12 06:36:27
|
Log: elementary/scrollers - added minor exceptios. Author: hermet Date: 2011-03-11 22:36:21 -0800 (Fri, 11 Mar 2011) New Revision: 57702 Trac: http://trac.enlightenment.org/e/changeset/57702 Modified: trunk/elementary/src/lib/elm_scroller.c trunk/elementary/src/lib/els_scroller.c Modified: trunk/elementary/src/lib/elm_scroller.c =================================================================== --- trunk/elementary/src/lib/elm_scroller.c 2011-03-12 05:54:51 UTC (rev 57701) +++ trunk/elementary/src/lib/elm_scroller.c 2011-03-12 06:36:21 UTC (rev 57702) @@ -282,9 +282,12 @@ double xw, yw; if (!wd) return; - evas_object_size_hint_min_get(wd->content, &minw, &minh); - evas_object_size_hint_max_get(wd->content, &maxw, &maxh); - evas_object_size_hint_weight_get(wd->content, &xw, &yw); + if (wd->content) + { + evas_object_size_hint_min_get(wd->content, &minw, &minh); + evas_object_size_hint_max_get(wd->content, &maxw, &maxh); + evas_object_size_hint_weight_get(wd->content, &xw, &yw); + } if (wd->scr) { elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); @@ -300,7 +303,7 @@ else if ((maxh > 0) && (vh > maxh)) vh = maxh; } else if (minh > 0) vh = minh; - evas_object_resize(wd->content, vw, vh); + if (wd->content) evas_object_resize(wd->content, vw, vh); w = -1; h = -1; edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh); Modified: trunk/elementary/src/lib/els_scroller.c =================================================================== --- trunk/elementary/src/lib/els_scroller.c 2011-03-12 05:54:51 UTC (rev 57701) +++ trunk/elementary/src/lib/els_scroller.c 2011-03-12 06:36:21 UTC (rev 57702) @@ -1090,6 +1090,7 @@ elm_smart_scroller_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { API_ENTRY return; + if (!sd->pan_obj) return; edje_object_calc_force(sd->edje_obj); evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h); } |
From: Enlightenment S. <no-...@en...> - 2011-03-17 09:39:44
|
Log: [elementary/widget] fixed logic error which was caused by me. Author: hermet Date: 2011-03-17 02:39:36 -0700 (Thu, 17 Mar 2011) New Revision: 57817 Trac: http://trac.enlightenment.org/e/changeset/57817 Modified: trunk/elementary/src/lib/elm_widget.c Modified: trunk/elementary/src/lib/elm_widget.c =================================================================== --- trunk/elementary/src/lib/elm_widget.c 2011-03-17 08:18:16 UTC (rev 57816) +++ trunk/elementary/src/lib/elm_widget.c 2011-03-17 09:39:36 UTC (rev 57817) @@ -1589,11 +1589,8 @@ { parent = elm_widget_parent_get(parent); sd = evas_object_smart_data_get(parent); - if (sd->resize_obj) - { - if (elm_widget_focus_get(sd->resize_obj)) - elm_widget_focused_object_clear(sd->resize_obj); - } + if (sd->resize_obj && elm_widget_focus_get(sd->resize_obj)) + elm_widget_focused_object_clear(sd->resize_obj); else { const Eina_List *l; |
From: Enlightenment S. <no-...@en...> - 2011-03-17 10:49:38
|
Log: elementary/elm_widget - fixed typo Author: hermet Date: 2011-03-17 03:49:31 -0700 (Thu, 17 Mar 2011) New Revision: 57820 Trac: http://trac.enlightenment.org/e/changeset/57820 Modified: trunk/elementary/src/lib/elm_widget.c Modified: trunk/elementary/src/lib/elm_widget.c =================================================================== --- trunk/elementary/src/lib/elm_widget.c 2011-03-17 09:56:21 UTC (rev 57819) +++ trunk/elementary/src/lib/elm_widget.c 2011-03-17 10:49:31 UTC (rev 57820) @@ -1589,7 +1589,7 @@ { parent = elm_widget_parent_get(parent); sd = evas_object_smart_data_get(parent); - if (sd->resize_obj && elm_widget_focus_get(sd->resize_obj)) + if ((sd->resize_obj) && (elm_widget_focus_get(sd->resize_obj))) elm_widget_focused_object_clear(sd->resize_obj); else { |
From: Enlightenment S. <no-...@en...> - 2011-03-18 06:36:45
|
Log: elementary/ctxpopup - fixed a minor error added exception for the null icon set. Author: hermet Date: 2011-03-17 23:36:39 -0700 (Thu, 17 Mar 2011) New Revision: 57842 Trac: http://trac.enlightenment.org/e/changeset/57842 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-18 06:24:29 UTC (rev 57841) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-18 06:36:39 UTC (rev 57842) @@ -824,6 +824,8 @@ } item->icon = icon; + if (!icon) return; + edje_object_part_swallow(item->base.view, "elm.swallow.icon", item->icon); edje_object_message_signal_process(item->base.view); } |
From: Enlightenment S. <no-...@en...> - 2011-03-22 07:51:24
|
Log: fixed white trailing Author: hermet Date: 2011-03-22 00:51:17 -0700 (Tue, 22 Mar 2011) New Revision: 57962 Trac: http://trac.enlightenment.org/e/changeset/57962 Modified: trunk/elementary/src/lib/elm_bg.c Modified: trunk/elementary/src/lib/elm_bg.c =================================================================== --- trunk/elementary/src/lib/elm_bg.c 2011-03-22 07:30:57 UTC (rev 57961) +++ trunk/elementary/src/lib/elm_bg.c 2011-03-22 07:51:17 UTC (rev 57962) @@ -415,7 +415,7 @@ EAPI void elm_bg_load_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { - ELM_CHECK_WIDTYPE(obj, widtype); + ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); const char *p; if (!wd) return; |
From: Enlightenment S. <no-...@en...> - 2011-03-23 10:52:24
|
Log: elementary/ctxpopup - modified fingersize to half one Author: hermet Date: 2011-03-23 03:52:18 -0700 (Wed, 23 Mar 2011) New Revision: 58028 Trac: http://trac.enlightenment.org/e/changeset/58028 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-23 10:44:55 UTC (rev 58027) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-23 10:52:18 UTC (rev 58028) @@ -308,7 +308,7 @@ if ((!wd) || (!rect)) return ELM_CTXPOPUP_DIRECTION_DOWN; - finger_size = elm_finger_size_get(); + finger_size = (elm_finger_size_get() / 2); edje_object_part_geometry_get(wd->arrow, "ctxpopup_arrow", NULL, NULL, &arrow_size.x, &arrow_size.y); @@ -488,22 +488,22 @@ case ELM_CTXPOPUP_DIRECTION_LEFT: edje_object_signal_emit(wd->arrow, "elm,state,left", "elm"); arrow_size.y = (y - (arrow_size.h * 0.5)); - arrow_size.x = (x + elm_finger_size_get()); + arrow_size.x = (x + (elm_finger_size_get() / 2)); break; case ELM_CTXPOPUP_DIRECTION_RIGHT: edje_object_signal_emit(wd->arrow, "elm,state,right", "elm"); arrow_size.y = (y - (arrow_size.h * 0.5)); - arrow_size.x = (x - elm_finger_size_get() - arrow_size.w); + arrow_size.x = (x - (elm_finger_size_get() / 2) - arrow_size.w); break; case ELM_CTXPOPUP_DIRECTION_UP: edje_object_signal_emit(wd->arrow, "elm,state,top", "elm"); arrow_size.x = (x - (arrow_size.w * 0.5)); - arrow_size.y = (y + elm_finger_size_get()); + arrow_size.y = (y + (elm_finger_size_get() / 2)); break; case ELM_CTXPOPUP_DIRECTION_DOWN: edje_object_signal_emit(wd->arrow, "elm,state,bottom", "elm"); arrow_size.x = (x - (arrow_size.w * 0.5)); - arrow_size.y = (y - elm_finger_size_get() - arrow_size.h); + arrow_size.y = (y - (elm_finger_size_get() / 2) - arrow_size.h); break; default: break; |
From: Enlightenment S. <no-...@en...> - 2011-03-24 02:14:29
|
Log: elementary/ctxpopup - removed fingersize completely. Author: hermet Date: 2011-03-23 19:14:22 -0700 (Wed, 23 Mar 2011) New Revision: 58051 Trac: http://trac.enlightenment.org/e/changeset/58051 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-24 01:45:12 UTC (rev 58050) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-24 02:14:22 UTC (rev 58051) @@ -299,7 +299,6 @@ Evas_Coord_Rectangle parent_size; Evas_Coord_Point arrow_size; Elm_Ctxpopup_Direction arrow = ELM_CTXPOPUP_DIRECTION_DOWN; - Evas_Coord finger_size; Evas_Coord_Point temp; int idx; @@ -308,8 +307,6 @@ if ((!wd) || (!rect)) return ELM_CTXPOPUP_DIRECTION_DOWN; - finger_size = (elm_finger_size_get() / 2); - edje_object_part_geometry_get(wd->arrow, "ctxpopup_arrow", NULL, NULL, &arrow_size.x, &arrow_size.y); evas_object_resize(wd->arrow, arrow_size.x, arrow_size.y); @@ -359,37 +356,35 @@ switch (wd->dir_priority[idx]) { case ELM_CTXPOPUP_DIRECTION_UP: - temp.y = pos.y - base_size.y; - if ((temp.y - arrow_size.y - finger_size) < hover_area.y) + temp.y = (pos.y - base_size.y); + if ((temp.y - arrow_size.y) < hover_area.y) continue; _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y -= (base_size.y + finger_size); + pos.y -= base_size.y; arrow = ELM_CTXPOPUP_DIRECTION_DOWN; break; case ELM_CTXPOPUP_DIRECTION_LEFT: temp.x = (pos.x - base_size.x); - if ((temp.x - arrow_size.x - finger_size) < hover_area.x) + if ((temp.x - arrow_size.x) < hover_area.x) continue; _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x -= (base_size.x + finger_size); + pos.x -= base_size.x; arrow = ELM_CTXPOPUP_DIRECTION_RIGHT; break; case ELM_CTXPOPUP_DIRECTION_RIGHT: temp.x = (pos.x + base_size.x); - if ((temp.x + arrow_size.x + finger_size) > + if ((temp.x + arrow_size.x) > (hover_area.x + hover_area.w)) continue; _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_LEFT; break; case ELM_CTXPOPUP_DIRECTION_DOWN: temp.y = (pos.y + base_size.y); - if ((temp.y + arrow_size.y + finger_size) > + if ((temp.y + arrow_size.y) > (hover_area.y + hover_area.h)) continue; _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_UP; break; default: @@ -417,7 +412,7 @@ { case ELM_CTXPOPUP_DIRECTION_UP: _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y -= (base_size.y + finger_size); + pos.y -= base_size.y; arrow = ELM_CTXPOPUP_DIRECTION_DOWN; if (pos.y < hover_area.y + arrow_size.y) { @@ -427,7 +422,7 @@ break; case ELM_CTXPOPUP_DIRECTION_LEFT: _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x -= (base_size.x + finger_size); + pos.x -= base_size.x; arrow = ELM_CTXPOPUP_DIRECTION_RIGHT; if (pos.x < hover_area.x + arrow_size.x) { @@ -437,7 +432,6 @@ break; case ELM_CTXPOPUP_DIRECTION_RIGHT: _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_LEFT; if (pos.x + arrow_size.x + base_size.x > hover_area.x + hover_area.w) @@ -447,7 +441,6 @@ break; case ELM_CTXPOPUP_DIRECTION_DOWN: _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_UP; if (pos.y + arrow_size.y + base_size.y > hover_area.y + hover_area.h) @@ -488,22 +481,22 @@ case ELM_CTXPOPUP_DIRECTION_LEFT: edje_object_signal_emit(wd->arrow, "elm,state,left", "elm"); arrow_size.y = (y - (arrow_size.h * 0.5)); - arrow_size.x = (x + (elm_finger_size_get() / 2)); + arrow_size.x = x; break; case ELM_CTXPOPUP_DIRECTION_RIGHT: edje_object_signal_emit(wd->arrow, "elm,state,right", "elm"); arrow_size.y = (y - (arrow_size.h * 0.5)); - arrow_size.x = (x - (elm_finger_size_get() / 2) - arrow_size.w); + arrow_size.x = (x - arrow_size.w); break; case ELM_CTXPOPUP_DIRECTION_UP: edje_object_signal_emit(wd->arrow, "elm,state,top", "elm"); arrow_size.x = (x - (arrow_size.w * 0.5)); - arrow_size.y = (y + (elm_finger_size_get() / 2)); + arrow_size.y = y; break; case ELM_CTXPOPUP_DIRECTION_DOWN: edje_object_signal_emit(wd->arrow, "elm,state,bottom", "elm"); arrow_size.x = (x - (arrow_size.w * 0.5)); - arrow_size.y = (y - (elm_finger_size_get() / 2) - arrow_size.h); + arrow_size.y = (y - arrow_size.h); break; default: break; |
From: Enlightenment S. <no-...@en...> - 2011-03-24 02:17:40
|
Log: elementary/ctxpopup - removed white trailing Author: hermet Date: 2011-03-23 19:17:34 -0700 (Wed, 23 Mar 2011) New Revision: 58052 Trac: http://trac.enlightenment.org/e/changeset/58052 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-24 02:14:22 UTC (rev 58051) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-24 02:17:34 UTC (rev 58052) @@ -311,7 +311,7 @@ &arrow_size.x, &arrow_size.y); evas_object_resize(wd->arrow, arrow_size.x, arrow_size.y); - //Initialize Area Rectangle. + //Initialize Area Rectangle. if (wd->hover_parent) evas_object_geometry_get(wd->hover_parent, &hover_area.x, &hover_area.y, &hover_area.w, &hover_area.h); @@ -327,7 +327,7 @@ evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL); - //recalc the edje + //recalc the edje edje_object_size_min_calc(wd->base, &base_size.x, &base_size.y); evas_object_smart_calculate(wd->base); @@ -340,7 +340,7 @@ if ((max_size.x > 0) && (base_size.x > max_size.x)) base_size.x = max_size.x; - //Limit to Min Size + //Limit to Min Size evas_object_size_hint_min_get(obj, &min_size.x, &min_size.y); if ((min_size.y > 0) && (base_size.y < min_size.y)) @@ -350,7 +350,7 @@ base_size.x = min_size.x; //Check the Which direction is available. - //If find a avaialble direction, it adjusts position and size. + //If find a avaialble direction, it adjusts position and size. for (idx = 0; idx < 4; idx++) { switch (wd->dir_priority[idx]) @@ -453,7 +453,7 @@ } } - //Final position and size. + //Final position and size. rect->x = pos.x; rect->y = pos.y; rect->w = base_size.x; @@ -518,7 +518,7 @@ wd = elm_widget_data_get(obj); if ((!wd) || (!wd->parent)) return; - //Box, Scroller + //Box, Scroller EINA_LIST_FOREACH(wd->items, elist, item) { _item_sizing_eval(item); @@ -550,7 +550,7 @@ _update_arrow(obj, wd->dir); _shift_base_by_arrow(wd->arrow, wd->dir, &rect); - //resize scroller according to final size. + //resize scroller according to final size. if (!wd->content) evas_object_smart_calculate(wd->scr); @@ -654,10 +654,10 @@ if (wd->scr) { - if (!strncmp(elm_object_style_get(obj), "default", + if (!strncmp(elm_object_style_get(obj), "default", strlen("default"))) elm_object_style_set(wd->scr, "ctxpopup"); - else + else elm_object_style_set(wd->scr, elm_object_style_get(obj)); } @@ -880,8 +880,8 @@ elm_object_style_set(wd->scr, "ctxpopup"); evas_object_size_hint_align_set(wd->scr, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_RESIZE, - _scroller_resize, obj); - edje_object_part_swallow(wd->base, "elm.swallow.content", wd->scr); + _scroller_resize, obj); + edje_object_part_swallow(wd->base, "elm.swallow.content", wd->scr); //box wd->box = elm_box_add(obj); @@ -889,7 +889,7 @@ EVAS_HINT_EXPAND); elm_scroller_content_set(wd->scr, wd->box); - elm_ctxpopup_horizontal_set(obj, wd->horizontal); + elm_ctxpopup_horizontal_set(obj, wd->horizontal); } static void @@ -1006,13 +1006,13 @@ } /** - * Sets the side icon associated with the ctxpopup item + * Sets the side icon associated with the ctxpopup item * * Once the icon object is set, a previously set one will be deleted. * You probably don't want, then, to have the <b>same</b> icon object * set for more than one item of the list (when replacing one of its * instances). - * + * * @param item Ctxpopup item * @param icon Icon object to be set * @@ -1058,7 +1058,7 @@ * * @param item Ctxpopup item * @param label String to set as label - * + * * @ingroup Ctxpopup */ EAPI void @@ -1081,8 +1081,8 @@ } /** - * Set the Ctxpopup's parent - * Set the parent object (it would much probably be the + * Set the Ctxpopup's parent + * Set the parent object (it would much probably be the * window that the ctxpopup is in). * * @param obj The ctxpopup object @@ -1119,7 +1119,7 @@ } /** - * Get the Ctxpopup's parent + * Get the Ctxpopup's parent * * @param obj The ctxpopup object * @@ -1222,15 +1222,15 @@ * Add a new item to a ctxpopup object. * * Both a item list and a content could not be set at the same time! - * once you set add a item, the previous content will be removed. + * once you set add a item, the previous content will be removed. * * @param obj Ctxpopup object - * @param icon Icon to be set on new item - * @param label The Label of the new item + * @param icon Icon to be set on new item + * @param label The Label of the new item * @param func Convenience function called when item selected * @param data Data passed to @p func above * @return A handle to the item added or @c NULL, on errors - * + * * @ingroup Ctxpopup */ EAPI Elm_Ctxpopup_Item * @@ -1263,7 +1263,7 @@ _item_new(item, "icon_text_style_item"); else if (label) _item_new(item, "text_style_item"); - else + else _item_new(item, "icon_style_item"); _item_icon_set(item, icon); @@ -1362,11 +1362,11 @@ /** * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the + * If you want to keep that old content object, use the * elm_ctxpopup_content_unset() function - * + * * Both a item list and a content could not be set at the same time! - * once you set a content, the previous list items will be removed. + * once you set a content, the previous list items will be removed. * * @param obj Ctxpopup object * @param content Content to be swallowed @@ -1407,7 +1407,7 @@ * Unset the ctxpopup content * * Unparent and return the content object which was set for this widget - * + * * @param obj Ctxpopup object * @return The content that was being used * @@ -1476,12 +1476,12 @@ * * @param obj Ctxpopup object * @param first 1st priority of direction to be returned - * @param second 2nd priority of direction to be returned - * @param third 3th priority of direction to be returned - * @param fourth 4th priority of direction to be returned + * @param second 2nd priority of direction to be returned + * @param third 3th priority of direction to be returned + * @param fourth 4th priority of direction to be returned * * @see elm_ctxpopup_direction_priority_set for more information. - * + * * @ingroup Ctxpopup */ EAPI void |
From: Enlightenment S. <no-...@en...> - 2011-03-24 15:49:53
|
Log: elementary/ctxpopup - fixed indentation Author: hermet Date: 2011-03-24 08:49:46 -0700 (Thu, 24 Mar 2011) New Revision: 58070 Trac: http://trac.enlightenment.org/e/changeset/58070 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-24 13:49:29 UTC (rev 58069) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-24 15:49:46 UTC (rev 58070) @@ -1014,7 +1014,7 @@ * instances). * * @param item Ctxpopup item - * @param icon Icon object to be set + * @param icon Icon object to be set * * @ingroup Ctxpopup */ @@ -1086,7 +1086,7 @@ * window that the ctxpopup is in). * * @param obj The ctxpopup object - * @param area The parent to use + * @param area The parent to use * * @note elm_ctxpopup_add() will automatically call this function * with its @c parent argument. @@ -1163,7 +1163,7 @@ * Change the ctxpopup's orientation to horizontal or vertical. * * @param obj Ctxpopup object - * @param horizontal @c EINA_TRUE for horizontal mode, @c EINA_FALSE for vertical + * @param horizontal @c EINA_TRUE for horizontal mode, @c EINA_FALSE for vertical * * @ingroup Ctxpopup */ |
From: Enlightenment S. <no-...@en...> - 2011-03-26 12:39:55
|
Log: elementary / transit - fixed typo. Author: hermet Date: 2011-03-26 05:39:47 -0700 (Sat, 26 Mar 2011) New Revision: 58094 Trac: http://trac.enlightenment.org/e/changeset/58094 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-03-26 00:39:59 UTC (rev 58093) +++ trunk/elementary/src/lib/Elementary.h.in 2011-03-26 12:39:47 UTC (rev 58094) @@ -2553,11 +2553,11 @@ EAPI Eina_Bool elm_transit_event_enabled_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); EAPI void elm_transit_del_cb_set(Elm_Transit *transit, void (*cb)(void *data, Elm_Transit* transit), void *data) EINA_ARG_NONNULL(1); EAPI void elm_transit_auto_reverse_set(Elm_Transit *transit, Eina_Bool reverse) EINA_ARG_NONNULL(1); - EAPI Eina_Bool elm_transit_auto_reverse_get(Elm_Transit *transit) EINA_ARG_NONNULL(1) EINA_ARG_NONNULL(1); + EAPI Eina_Bool elm_transit_auto_reverse_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); EAPI void elm_transit_repeat_times_set(Elm_Transit *transit, int repeat) EINA_ARG_NONNULL(1); - EAPI int elm_transit_repeat_times_get(Elm_Transit *transit) EINA_ARG_NONNULL(1); + EAPI int elm_transit_repeat_times_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); EAPI void elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mode) EINA_ARG_NONNULL(1); - EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1) EINA_ARG_NONNULL(1); + EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); EAPI void elm_transit_duration_set(Elm_Transit *transit, double duration) EINA_ARG_NONNULL(1); EAPI double elm_transit_duration_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1); EAPI void elm_transit_go(Elm_Transit *transit) EINA_ARG_NONNULL(1); Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-03-26 00:39:59 UTC (rev 58093) +++ trunk/elementary/src/lib/elm_transit.c 2011-03-26 12:39:47 UTC (rev 58094) @@ -713,7 +713,7 @@ * @ingroup Transit */ EAPI Eina_Bool -elm_transit_auto_reverse_get(Elm_Transit *transit) +elm_transit_auto_reverse_get(const Elm_Transit *transit) { ELM_TRANSIT_CHECK_OR_RETURN(transit, EINA_FALSE); return transit->auto_reverse; @@ -754,7 +754,7 @@ * @ingroup Transit */ EAPI int -elm_transit_repeat_times_get(Elm_Transit *transit) +elm_transit_repeat_times_get(const Elm_Transit *transit) { ELM_TRANSIT_CHECK_OR_RETURN(transit, 0); return transit->repeat.count; |
From: Enlightenment S. <no-...@en...> - 2011-03-26 12:42:50
|
Log: elementary/transit - removed tailing whites. Author: hermet Date: 2011-03-26 05:42:43 -0700 (Sat, 26 Mar 2011) New Revision: 58095 Trac: http://trac.enlightenment.org/e/changeset/58095 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-03-26 12:39:47 UTC (rev 58094) +++ trunk/elementary/src/lib/elm_transit.c 2011-03-26 12:42:43 UTC (rev 58095) @@ -101,7 +101,7 @@ Evas_Map *map; Eina_Bool map_enabled : 1; Eina_Bool visible : 1; -}; +}; struct _Elm_Obj_Data { @@ -114,7 +114,7 @@ typedef struct _Elm_Obj_Data Elm_Obj_Data; typedef struct _Elm_Obj_State Elm_Obj_State; -static void +static void _elm_transit_objs_states_save(Elm_Transit *transit) { Eina_List *list; @@ -124,13 +124,13 @@ EINA_LIST_FOREACH(transit->objs, list, obj) { - obj_data = evas_object_data_get(obj, _transit_key); + obj_data = evas_object_data_get(obj, _transit_key); if (!obj_data) continue; state = calloc(1, sizeof(Elm_Obj_State)); if (!state) continue; - evas_object_geometry_get(obj, &state->x, &state->y, &state->w, &state->h); + evas_object_geometry_get(obj, &state->x, &state->y, &state->w, &state->h); evas_object_color_get(obj, &state->r, &state->g, &state->b, &state->a); - state->visible = evas_object_visible_get(obj); + state->visible = evas_object_visible_get(obj); state->map_enabled = evas_object_map_enable_get(obj); if (evas_object_map_get(obj)) state->map = evas_map_dup(evas_object_map_get(obj)); @@ -158,7 +158,7 @@ Elm_Obj_State *state = obj_data->state; evas_object_pass_events_set(obj, obj_data->pass_events); - + //recover the states of the object. if (state) { @@ -167,7 +167,7 @@ evas_object_color_set(obj, state->r, state->g, state->b, state->a); if (state->visible) evas_object_show(obj); else evas_object_hide(obj); - if (state->map_enabled) + if (state->map_enabled) evas_object_map_enable_set(obj, EINA_TRUE); else evas_object_map_enable_set(obj, EINA_FALSE); @@ -259,9 +259,9 @@ transit->time.current = ecore_loop_time_get(); elapsed_time = transit->time.current - transit->time.begin; - duration = transit->time.duration + transit->time.delayed; + duration = transit->time.duration + transit->time.delayed; - if (elapsed_time > duration) + if (elapsed_time > duration) elapsed_time = duration; transit->progress = elapsed_time / duration; @@ -477,7 +477,7 @@ * @param obj Object to be animated. * * @ingroup Transit - * @warning It is not allowed to add a new object after transit begins to go. + * @warning It is not allowed to add a new object after transit begins to go. */ EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj) @@ -503,7 +503,7 @@ transit->objs = eina_list_append(transit->objs, obj); - if (!transit->event_enabled) + if (!transit->event_enabled) evas_object_pass_events_set(obj, EINA_TRUE); evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, @@ -521,7 +521,7 @@ * @param obj Object to be removed from @p transit. * * @ingroup Transit - * @warning It is not allowed to remove objects after transit begins to go. + * @warning It is not allowed to remove objects after transit begins to go. */ EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj) @@ -529,11 +529,11 @@ ELM_TRANSIT_CHECK_OR_RETURN(transit); EINA_SAFETY_ON_NULL_RETURN(obj); Elm_Obj_Data *obj_data; - + if (transit->animator) return; obj_data = evas_object_data_get(obj, _transit_key); - + if ((!obj_data) || (obj_data->transit != transit)) return; _elm_transit_object_remove(transit, obj); @@ -828,7 +828,7 @@ * * @ingroup Transit */ -EAPI double +EAPI double elm_transit_duration_get(const Elm_Transit *transit) { ELM_TRANSIT_CHECK_OR_RETURN(transit, 0.0); @@ -836,7 +836,7 @@ } /** - * Starts the transition. + * Starts the transition. * Once this API is called, the transit begins to measure the time. * * @note @p transit can not be NULL @@ -855,7 +855,7 @@ if (!transit->state_keep) _elm_transit_objs_states_save(transit); - + transit->time.paused = 0; transit->time.delayed = 0; transit->time.begin = ecore_loop_time_get(); @@ -863,8 +863,8 @@ } /** - * Pause/Resume the transition. - * If you call elm_transit_go again, paused states will affect no anymore. + * Pause/Resume the transition. + * If you call elm_transit_go again, paused states will affect no anymore. * * @note @p transit can not be NULL * @@ -881,14 +881,14 @@ if (paused) { - if (transit->time.paused > 0) + if (transit->time.paused > 0) return; ecore_animator_freeze(transit->animator); transit->time.paused = ecore_loop_time_get(); } else { - if (transit->time.paused == 0) + if (transit->time.paused == 0) return; ecore_animator_thaw(transit->animator); transit->time.delayed += (ecore_loop_time_get() - transit->time.paused); @@ -897,7 +897,7 @@ } /** - * Get the value of paused status. + * Get the value of paused status. * * @see elm_transit_paused_set() * @@ -914,7 +914,7 @@ { ELM_TRANSIT_CHECK_OR_RETURN(transit, EINA_FALSE); - if (transit->time.paused == 0) + if (transit->time.paused == 0) return EINA_FALSE; return EINA_TRUE; @@ -944,10 +944,10 @@ * If it is not kept, the objects states will be reset when transition ends. * * @note @p transit can not be NULL. - * @note One state includes geometry, color, map data. + * @note One state includes geometry, color, map data. * * @param transit The transit object. - * @param state_keep Keeping or Non Keeping. + * @param state_keep Keeping or Non Keeping. * * @ingroup Transit */ @@ -968,9 +968,9 @@ * @see elm_transit_objects_final_state_keep_set() * * @param transit The transit object. - * @return EINA_TRUE means the states of the objects will be reset. + * @return EINA_TRUE means the states of the objects will be reset. * If @p transit is NULL, EINA_FALSE is returned - + * @ingroup Transit */ EAPI Eina_Bool @@ -1034,8 +1034,8 @@ /** * Add the Resizing Effect to Elm_Transit. * - * @note This API is one of the facades. It creates resizing effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates resizing effect context + * and add it's required APIs to elm_transit_effect_add. * * @see elm_transit_effect_add() * @@ -1055,7 +1055,7 @@ void *effect_context = _transit_effect_resizing_context_new(from_w, from_h, to_w, to_h); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_resizing_op, effect_context, _transit_effect_resizing_context_free); return effect_context; @@ -1185,8 +1185,8 @@ /** * Add the Translation Effect to Elm_Transit. * - * @note This API is one of the facades. It creates translation effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates translation effect context + * and add it's required APIs to elm_transit_effect_add. * * @see elm_transit_effect_add() * @@ -1210,7 +1210,7 @@ void *effect_context = _transit_effect_translation_context_new(from_dx, from_dy, to_dx, to_dy); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_translation_op, effect_context, _transit_effect_translation_context_free); return effect_context; @@ -1276,8 +1276,8 @@ /** * Add the Zoom Effect to Elm_Transit. * - * @note This API is one of the facades. It creates zoom effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates zoom effect context + * and add it's required APIs to elm_transit_effect_add. * * @see elm_transit_effect_add() * @@ -1299,7 +1299,7 @@ void *effect_context = _transit_effect_zoom_context_new(from_rate, to_rate); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_zoom_op, effect_context, _transit_effect_zoom_context_free); return effect_context; @@ -1365,7 +1365,7 @@ if ((degree < 90) && (degree > -90)) { obj = front; - if (front != back) + if (front != back) { evas_object_hide(back); evas_object_show(front); @@ -1435,12 +1435,12 @@ /** * Add the Flip Effect to Elm_Transit. * - * @note This API is one of the facades. It creates flip effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates flip effect context + * and add it's required APIs to elm_transit_effect_add. * @note This effect is applied to each pair of objects in the order they are listed * in the transit list of objects. The first object in the pair will be the * "front" object and the second will be the "back" object. - * + * * @see elm_transit_effect_add() * * @param transit Transit object. @@ -1461,7 +1461,7 @@ void *effect_context = _transit_effect_flip_context_new(axis, cw); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_flip_op, effect_context, _transit_effect_flip_context_free); return effect_context; @@ -1736,12 +1736,12 @@ /** * Add the Resizable Flip Effect to Elm_Transit. * - * @note This API is one of the facades. It creates resizable flip effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates resizable flip effect context + * and add it's required APIs to elm_transit_effect_add. * @note This effect is applied to each pair of objects in the order they are listed * in the transit list of objects. The first object in the pair will be the * "front" object and the second will be the "back" object. - * + * * @see elm_transit_effect_add() * * @param transit Transit object. @@ -1762,7 +1762,7 @@ void *effect_context = _transit_effect_resizable_flip_context_new(axis, cw); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_resizable_flip_op, effect_context, _transit_effect_resizable_flip_context_free); return effect_context; @@ -1970,9 +1970,9 @@ /** * Add the Wipe Effect to Elm_Transit. * - * @note This API is one of the facades. It creates wipe effect context - * and add it's required APIs to elm_transit_effect_add. - * + * @note This API is one of the facades. It creates wipe effect context + * and add it's required APIs to elm_transit_effect_add. + * * @see elm_transit_effect_add() * * @param transit Transit object. @@ -1993,7 +1993,7 @@ void *effect_context = _transit_effect_wipe_context_new(type, dir); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_wipe_op, effect_context, _transit_effect_wipe_context_free); return effect_context; @@ -2063,9 +2063,9 @@ /** * Add the Color Effect to Elm_Transit. * - * @note This API is one of the facades. It creates color effect context - * and add it's required APIs to elm_transit_effect_add. - * + * @note This API is one of the facades. It creates color effect context + * and add it's required APIs to elm_transit_effect_add. + * * @see elm_transit_effect_add() * * @param transit Transit object. @@ -2088,7 +2088,7 @@ void *effect_context = _transit_effect_color_context_new(from_r, from_g, from_b, from_a, to_r, to_g, to_b, to_a); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_color_op, effect_context, _transit_effect_color_context_free); return effect_context; @@ -2273,17 +2273,17 @@ /** * Add the Fade Effect to Elm_Transit. * - * @note This API is one of the facades. It creates fade effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates fade effect context + * and add it's required APIs to elm_transit_effect_add. * @note This effect is applied to each pair of objects in the order they are listed * in the transit list of objects. The first object in the pair will be the * "before" object and the second will be the "after" object. - * + * * @see elm_transit_effect_add() * * @param transit Transit object. * @return Fade effect context data. - * + * * @ingroup Transit * @warning Is higher recommended just create a transit with this effect when * the window that the objects of the transit belongs has already been created. @@ -2297,7 +2297,7 @@ void *effect_context = _transit_effect_fade_context_new(); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_fade_op, effect_context, _transit_effect_fade_context_free); return effect_context; @@ -2456,17 +2456,17 @@ /** * Add the Blend Effect to Elm_Transit. * - * @note This API is one of the facades. It creates blend effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates blend effect context + * and add it's required APIs to elm_transit_effect_add. * @note This effect is applied to each pair of objects in the order they are listed * in the transit list of objects. The first object in the pair will be the * "before" object and the second will be the "after" object. - * + * * @see elm_transit_effect_add() * * @param transit Transit object. * @return Blend effect context data. - * + * * @ingroup Transit * @warning Is higher recommended just create a transit with this effect when * the window that the objects of the transit belongs has already been created. @@ -2480,7 +2480,7 @@ void *effect_context = _transit_effect_blend_context_new(); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_blend_op, effect_context, _transit_effect_blend_context_free); return effect_context; @@ -2554,16 +2554,16 @@ /** * Add the Rotation Effect to Elm_Transit. * - * @note This API is one of the facades. It creates rotation effect context - * and add it's required APIs to elm_transit_effect_add. - * + * @note This API is one of the facades. It creates rotation effect context + * and add it's required APIs to elm_transit_effect_add. + * * @see elm_transit_effect_add() * * @param transit Transit object. * @param from_degree Degree when effect begins. * @param to_degree Degree when effect is ends. * @return Rotation effect context data. - * + * * @ingroup Transit * @warning Is higher recommended just create a transit with this effect when * the window that the objects of the transit belongs has already been created. @@ -2577,7 +2577,7 @@ void *effect_context = _transit_effect_rotation_context_new(from_degree, to_degree); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_rotation_op, effect_context, _transit_effect_rotation_context_free); return effect_context; @@ -2654,8 +2654,8 @@ /** * Add the ImageAnimation Effect to Elm_Transit. * - * @note This API is one of the facades. It creates image animation effect context - * and add it's required APIs to elm_transit_effect_add. + * @note This API is one of the facades. It creates image animation effect context + * and add it's required APIs to elm_transit_effect_add. * The @p images parameter is a list images paths. This list and * its contents will be deleted at the end of the effect by * elm_transit_effect_image_animation_context_free() function. @@ -2674,7 +2674,7 @@ * elm_transit_effect_image_animation_add(transi, images); * * @endcode - * + * * @see elm_transit_effect_add() * * @param transit Transit object. @@ -2682,7 +2682,7 @@ * its contents will be deleted at the end of the effect by * elm_transit_effect_image_animation_context_free() function. * @return Image Animation effect context data. - * + * * @ingroup Transit */ EAPI void * @@ -2692,7 +2692,7 @@ void *effect_context = _transit_effect_image_animation_context_new(images); if (!effect_context) return NULL; - elm_transit_effect_add(transit, + elm_transit_effect_add(transit, _transit_effect_image_animation_op, effect_context, _transit_effect_image_animation_context_free); return effect_context; |
From: Enlightenment S. <no-...@en...> - 2011-03-28 00:46:23
|
Log: elementary/transit - updated doxygen Author: hermet Date: 2011-03-27 17:46:17 -0700 (Sun, 27 Mar 2011) New Revision: 58136 Trac: http://trac.enlightenment.org/e/changeset/58136 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-03-27 23:45:58 UTC (rev 58135) +++ trunk/elementary/src/lib/elm_transit.c 2011-03-28 00:46:17 UTC (rev 58136) @@ -981,7 +981,7 @@ } /////////////////////////////////////////////////////////////////////////////// -//Resizing FX +//Resizing Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Resizing Elm_Transit_Effect_Resizing; @@ -1062,7 +1062,7 @@ } /////////////////////////////////////////////////////////////////////////////// -//Translation FX +//Translation Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Translation Elm_Transit_Effect_Translation; typedef struct _Elm_Transit_Effect_Translation_Node Elm_Transit_Effect_Translation_Node; @@ -1218,7 +1218,7 @@ /////////////////////////////////////////////////////////////////////////////// -//Zoom FX +//Zoom Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Zoom Elm_Transit_Effect_Zoom; @@ -1307,7 +1307,7 @@ /////////////////////////////////////////////////////////////////////////////// -//Flip FX +//Flip Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Flip Elm_Transit_Effect_Flip; @@ -1468,7 +1468,7 @@ } /////////////////////////////////////////////////////////////////////////////// -//ResizableFlip FX +//ResizableFlip Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Resizable_Flip Elm_Transit_Effect_ResizableFlip; typedef struct _Elm_Transit_Effect_Resizable_Flip_Node Elm_Transit_Effect_ResizableFlip_Node; @@ -1770,7 +1770,7 @@ /////////////////////////////////////////////////////////////////////////////// -//Wipe FX +//Wipe Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Wipe Elm_Transit_Effect_Wipe; @@ -2001,7 +2001,7 @@ /////////////////////////////////////////////////////////////////////////////// -//Color FX +//Color Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Color Elm_Transit_Effect_Color; @@ -2095,7 +2095,7 @@ } /////////////////////////////////////////////////////////////////////////////// -//Fade FX +//Fade Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Fade Elm_Transit_Effect_Fade; typedef struct _Elm_Transit_Effect_Fade_Node Elm_Transit_Effect_Fade_Node; @@ -2305,7 +2305,7 @@ /////////////////////////////////////////////////////////////////////////////// -//Blend FX +//Blend Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Blend Elm_Transit_Effect_Blend; typedef struct _Elm_Transit_Effect_Blend_Node Elm_Transit_Effect_Blend_Node; @@ -2488,7 +2488,7 @@ /////////////////////////////////////////////////////////////////////////////// -//Rotation FX +//Rotation Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Rotation Elm_Transit_Effect_Rotation; @@ -2585,7 +2585,7 @@ /////////////////////////////////////////////////////////////////////////////// -// ImageAnimation FX +//ImageAnimation Effect /////////////////////////////////////////////////////////////////////////////// typedef struct _Elm_Transit_Effect_Image_Animation Elm_Transit_Effect_Image_Animation; |
From: Enlightenment S. <no-...@en...> - 2011-03-30 05:35:46
|
Log: elementary/transit - modified fade effect to be available applying only one object case Author: hermet Date: 2011-03-29 22:35:38 -0700 (Tue, 29 Mar 2011) New Revision: 58192 Trac: http://trac.enlightenment.org/e/changeset/58192 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-03-30 01:35:15 UTC (rev 58191) +++ trunk/elementary/src/lib/elm_transit.c 2011-03-30 05:35:38 UTC (rev 58192) @@ -2147,7 +2147,7 @@ int i, count; count = eina_list_count(transit->objs); - for (i = 0; i < (count - 1); i += 2) + for (i = 0; i < count; i += 2) { fade = ELM_NEW(Elm_Transit_Effect_Fade_Node); if (!fade) |
From: Enlightenment S. <no-...@en...> - 2011-03-30 09:13:03
|
Log: elementary/transit - modified to add same objects. Author: hermet Date: 2011-03-30 02:12:57 -0700 (Wed, 30 Mar 2011) New Revision: 58196 Trac: http://trac.enlightenment.org/e/changeset/58196 Modified: trunk/elementary/src/lib/elm_transit.c Modified: trunk/elementary/src/lib/elm_transit.c =================================================================== --- trunk/elementary/src/lib/elm_transit.c 2011-03-30 08:00:12 UTC (rev 58195) +++ trunk/elementary/src/lib/elm_transit.c 2011-03-30 09:12:57 UTC (rev 58196) @@ -115,27 +115,22 @@ typedef struct _Elm_Obj_State Elm_Obj_State; static void -_elm_transit_objs_states_save(Elm_Transit *transit) +_elm_transit_obj_states_save(Evas_Object *obj) { - Eina_List *list; - Evas_Object *obj; Elm_Obj_Data *obj_data; Elm_Obj_State *state; - EINA_LIST_FOREACH(transit->objs, list, obj) - { - obj_data = evas_object_data_get(obj, _transit_key); - if (!obj_data) continue; - state = calloc(1, sizeof(Elm_Obj_State)); - if (!state) continue; - evas_object_geometry_get(obj, &state->x, &state->y, &state->w, &state->h); - evas_object_color_get(obj, &state->r, &state->g, &state->b, &state->a); - state->visible = evas_object_visible_get(obj); - state->map_enabled = evas_object_map_enable_get(obj); - if (evas_object_map_get(obj)) - state->map = evas_map_dup(evas_object_map_get(obj)); - obj_data->state = state; - } + obj_data = evas_object_data_get(obj, _transit_key); + if ((!obj_data) || (obj_data->state)) return; + state = calloc(1, sizeof(Elm_Obj_State)); + if (!state) return; + evas_object_geometry_get(obj, &state->x, &state->y, &state->w, &state->h); + evas_object_color_get(obj, &state->r, &state->g, &state->b, &state->a); + state->visible = evas_object_visible_get(obj); + state->map_enabled = evas_object_map_enable_get(obj); + if (evas_object_map_get(obj)) + state->map = evas_map_dup(evas_object_map_get(obj)); + obj_data->state = state; } static void @@ -154,29 +149,43 @@ static void _elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj) { + Eina_List *l; Elm_Obj_Data *obj_data = evas_object_data_del(obj, _transit_key); Elm_Obj_State *state = obj_data->state; evas_object_pass_events_set(obj, obj_data->pass_events); - //recover the states of the object. if (state) { - evas_object_move(obj, state->x, state->y); - evas_object_resize(obj, state->w, state->h); - evas_object_color_set(obj, state->r, state->g, state->b, state->a); - if (state->visible) evas_object_show(obj); - else evas_object_hide(obj); - if (state->map_enabled) - evas_object_map_enable_set(obj, EINA_TRUE); - else - evas_object_map_enable_set(obj, EINA_FALSE); - if (state->map) - evas_object_map_set(obj, state->map); + //recover the states of the object. + if (!transit->state_keep) + { + evas_object_move(obj, state->x, state->y); + evas_object_resize(obj, state->w, state->h); + evas_object_color_set(obj, state->r, state->g, state->b, state->a); + if (state->visible) evas_object_show(obj); + else evas_object_hide(obj); + if (state->map_enabled) + evas_object_map_enable_set(obj, EINA_TRUE); + else + evas_object_map_enable_set(obj, EINA_FALSE); + if (state->map) + evas_object_map_set(obj, state->map); + + } free(state); } free(obj_data); - transit->objs = eina_list_remove(transit->objs, obj); + + //remove duplicated objects + //TODO: Need to consider about optimizing here + while(1) + { + if (!eina_list_data_find_list(transit->objs, obj)) + break; + transit->objs = eina_list_remove(transit->objs, obj); + } + evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _elm_transit_object_remove_cb); } @@ -487,28 +496,30 @@ EINA_SAFETY_ON_NULL_RETURN(obj); Elm_Obj_Data *obj_data; - if (transit->animator) return; - obj_data = evas_object_data_get(obj, _transit_key); - if (obj_data) + if ((obj_data) && (obj_data->transit != transit)) + elm_transit_object_remove(obj_data->transit, obj); + + if ((!obj_data) || (obj_data->transit != transit)) { - if (obj_data->transit == transit) return; - elm_transit_object_remove(obj_data->transit, obj); + obj_data = ELM_NEW(Elm_Obj_Data); + obj_data->pass_events = evas_object_pass_events_get(obj); + obj_data->transit = transit; + evas_object_data_set(obj, _transit_key, obj_data); + if (!transit->event_enabled) + evas_object_pass_events_set(obj, EINA_TRUE); + + evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, + _elm_transit_object_remove_cb, + transit); } - obj_data = ELM_NEW(Elm_Obj_Data); - obj_data->pass_events = evas_object_pass_events_get(obj); - obj_data->transit = transit; - evas_object_data_set(obj, _transit_key, obj_data); - transit->objs = eina_list_append(transit->objs, obj); - if (!transit->event_enabled) - evas_object_pass_events_set(obj, EINA_TRUE); + if (!transit->state_keep) + _elm_transit_obj_states_save(obj); - evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, - _elm_transit_object_remove_cb, transit); } /** @@ -531,8 +542,6 @@ EINA_SAFETY_ON_NULL_RETURN(obj); Elm_Obj_Data *obj_data; - if (transit->animator) return; - obj_data = evas_object_data_get(obj, _transit_key); if ((!obj_data) || (obj_data->transit != transit)) return; @@ -854,9 +863,6 @@ if (transit->animator) ecore_animator_del(transit->animator); - if (!transit->state_keep) - _elm_transit_objs_states_save(transit); - transit->time.paused = 0; transit->time.delayed = 0; transit->time.begin = ecore_loop_time_get(); @@ -955,10 +961,18 @@ EAPI void elm_transit_objects_final_state_keep_set(Elm_Transit *transit, Eina_Bool state_keep) { + Eina_List *list; + Evas_Object *obj; + ELM_TRANSIT_CHECK_OR_RETURN(transit); if (transit->state_keep == state_keep) return; if (transit->animator) return; transit->state_keep = !!state_keep; + if (!state_keep) + { + EINA_LIST_FOREACH(transit->objs, list, obj) + _elm_transit_obj_states_save(obj); + } } /** |
From: Enlightenment S. <no-...@en...> - 2011-03-31 03:09:34
|
Log: elementary/ctxpopup - removed unuseful line. Author: hermet Date: 2011-03-30 20:09:27 -0700 (Wed, 30 Mar 2011) New Revision: 58219 Trac: http://trac.enlightenment.org/e/changeset/58219 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-30 21:26:33 UTC (rev 58218) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-03-31 03:09:27 UTC (rev 58219) @@ -811,10 +811,7 @@ _item_icon_set(Elm_Ctxpopup_Item *item, Evas_Object *icon) { if (item->icon) - { - elm_widget_sub_object_del(item->base.view, item->icon); - evas_object_del(item->icon); - } + evas_object_del(item->icon); item->icon = icon; if (!icon) return; |
From: Enlightenment S. <no-...@en...> - 2011-04-01 06:17:17
|
Log: elementary/animator - removed white spaces Author: hermet Date: 2011-03-31 23:17:11 -0700 (Thu, 31 Mar 2011) New Revision: 58244 Trac: http://trac.enlightenment.org/e/changeset/58244 Modified: trunk/elementary/src/lib/elm_animator.c Modified: trunk/elementary/src/lib/elm_animator.c =================================================================== --- trunk/elementary/src/lib/elm_animator.c 2011-04-01 06:09:18 UTC (rev 58243) +++ trunk/elementary/src/lib/elm_animator.c 2011-04-01 06:17:11 UTC (rev 58244) @@ -116,23 +116,23 @@ switch (animator->curve_style) { case ELM_ANIMATOR_CURVE_IN_OUT: - frame = _animator_curve_in_out(elapsed_time / animator->duration); - break; + frame = _animator_curve_in_out(elapsed_time / animator->duration); + break; case ELM_ANIMATOR_CURVE_IN: - frame = _animator_curve_in(elapsed_time / animator->duration); - break; + frame = _animator_curve_in(elapsed_time / animator->duration); + break; case ELM_ANIMATOR_CURVE_OUT: - frame = _animator_curve_out(elapsed_time / animator->duration); - break; + frame = _animator_curve_out(elapsed_time / animator->duration); + break; default: - frame = _animator_curve_linear(elapsed_time / animator->duration); - break; + frame = _animator_curve_linear(elapsed_time / animator->duration); + break; } - + //Reverse? if (animator->auto_reverse) { - if (!(animator->cur_repeat_cnt % 2)) frame = 1 - frame; + if (!(animator->cur_repeat_cnt % 2)) frame = 1 - frame; } if (animator->duration > 0) @@ -143,11 +143,11 @@ //Repeat and reverse and time done! if (!animator->cur_repeat_cnt) { - animator->on_animating = EINA_FALSE; - _delete_animator(animator); - if (animator->completion_op) - animator->completion_op(animator->completion_arg); - return ECORE_CALLBACK_CANCEL; + animator->on_animating = EINA_FALSE; + _delete_animator(animator); + if (animator->completion_op) + animator->completion_op(animator->completion_arg); + return ECORE_CALLBACK_CANCEL; } //Repeat Case @@ -159,7 +159,7 @@ static void _animator_parent_del(void *data, Evas *evas __UNUSED__, - Evas_Object *obj __UNUSED__, void *event __UNUSED__) + Evas_Object *obj __UNUSED__, void *event __UNUSED__) { elm_animator_del(data); } @@ -202,12 +202,11 @@ * * @ingroup Animator */ -EAPI Elm_Animator_Curve_Style +EAPI Elm_Animator_Curve_Style elm_animator_curve_style_get(const Elm_Animator *animator) { ELM_ANIMATOR_CHECK_OR_RETURN(animator, ELM_ANIMATOR_CURVE_LINEAR); - - return animator->curve_style; + return animator->curve_style; } /** @@ -226,10 +225,10 @@ animator->auto_reverse = reverse; if (reverse) animator->repeat_cnt = - _animator_compute_reverse_repeat_count(animator->repeat_cnt); + _animator_compute_reverse_repeat_count(animator->repeat_cnt); else animator->repeat_cnt = - _animator_compute_no_reverse_repeat_count(animator->repeat_cnt); + _animator_compute_no_reverse_repeat_count(animator->repeat_cnt); } /** @@ -242,11 +241,10 @@ */ EAPI void elm_animator_curve_style_set(Elm_Animator *animator, - Elm_Animator_Curve_Style cs) + Elm_Animator_Curve_Style cs) { ELM_ANIMATOR_CHECK_OR_RETURN(animator); - - animator->curve_style = cs; + animator->curve_style = cs; } /** @@ -305,7 +303,7 @@ elm_animator_curve_style_set(animator, ELM_ANIMATOR_CURVE_LINEAR); if (parent) evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL, - _animator_parent_del, animator); + _animator_parent_del, animator); return animator; } @@ -338,7 +336,7 @@ _delete_animator(animator); if (animator->parent) evas_object_event_callback_del(animator->parent, EVAS_CALLBACK_DEL, - _animator_parent_del); + _animator_parent_del); EINA_MAGIC_SET(animator, EINA_MAGIC_NONE); free(animator); @@ -355,7 +353,7 @@ */ EAPI void elm_animator_completion_callback_set(Elm_Animator *animator, - Elm_Animator_Completion_Cb func, + Elm_Animator_Completion_Cb func, void *data) { ELM_ANIMATOR_CHECK_OR_RETURN(animator); |
From: Enlightenment S. <no-...@en...> - 2011-04-01 06:27:05
|
Log: elementary/anchorblock - removed white spaces Author: hermet Date: 2011-03-31 23:26:58 -0700 (Thu, 31 Mar 2011) New Revision: 58245 Trac: http://trac.enlightenment.org/e/changeset/58245 Modified: trunk/elementary/src/lib/elc_anchorblock.c Modified: trunk/elementary/src/lib/elc_anchorblock.c =================================================================== --- trunk/elementary/src/lib/elc_anchorblock.c 2011-04-01 06:17:11 UTC (rev 58244) +++ trunk/elementary/src/lib/elc_anchorblock.c 2011-04-01 06:26:58 UTC (rev 58245) @@ -211,7 +211,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "anchorblock"); elm_widget_type_set(obj, "anchorblock"); elm_widget_sub_object_add(parent, obj); @@ -229,12 +229,12 @@ evas_object_size_hint_align_set(wd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + _changed_size_hints, obj); elm_entry_entry_set(wd->entry, ""); evas_object_smart_callback_add(wd->entry, "anchor,clicked", - _anchor_clicked, obj); + _anchor_clicked, obj); _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); |
From: Enlightenment S. <no-...@en...> - 2011-04-01 09:08:18
|
Log: elementary/ctxpopup - removed white space Author: hermet Date: 2011-04-01 02:08:11 -0700 (Fri, 01 Apr 2011) New Revision: 58247 Trac: http://trac.enlightenment.org/e/changeset/58247 Modified: trunk/elementary/src/lib/elc_ctxpopup.c Modified: trunk/elementary/src/lib/elc_ctxpopup.c =================================================================== --- trunk/elementary/src/lib/elc_ctxpopup.c 2011-04-01 08:05:24 UTC (rev 58246) +++ trunk/elementary/src/lib/elc_ctxpopup.c 2011-04-01 09:08:11 UTC (rev 58247) @@ -927,7 +927,7 @@ Evas_Coord x, y, w, h; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "ctxpopup"); elm_widget_type_set(obj, "ctxpopup"); elm_widget_sub_object_add(parent, obj); |
From: Enlightenment S. <no-...@en...> - 2011-04-01 11:08:39
|
Log: elementary / cursor, scroller, icon - removed white spaces Author: hermet Date: 2011-04-01 04:08:31 -0700 (Fri, 01 Apr 2011) New Revision: 58248 Trac: http://trac.enlightenment.org/e/changeset/58248 Modified: trunk/elementary/src/lib/els_cursor.c trunk/elementary/src/lib/els_icon.c trunk/elementary/src/lib/els_scroller.c Modified: trunk/elementary/src/lib/els_cursor.c =================================================================== --- trunk/elementary/src/lib/els_cursor.c 2011-04-01 09:08:11 UTC (rev 58247) +++ trunk/elementary/src/lib/els_cursor.c 2011-04-01 11:08:31 UTC (rev 58248) @@ -18,7 +18,7 @@ #define _cursor_key "_elm_cursor" -struct _Cursor_Id +struct _Cursor_Id { const char *name; #ifdef HAVE_ELEMENTARY_X Modified: trunk/elementary/src/lib/els_icon.c =================================================================== --- trunk/elementary/src/lib/els_icon.c 2011-04-01 09:08:11 UTC (rev 58247) +++ trunk/elementary/src/lib/els_icon.c 2011-04-01 11:08:31 UTC (rev 58248) @@ -297,7 +297,7 @@ return; case ELM_IMAGE_FLIP_VERTICAL: _els_smart_icon_flip_vertical(sd); - return; + return; case ELM_IMAGE_ROTATE_180_CW: _els_smart_icon_rotate_180(sd); return; @@ -321,28 +321,28 @@ switch (orient) { case ELM_IMAGE_FLIP_TRANSPOSE: - to = data; - hw = -hw + 1; - break; + to = data; + hw = -hw + 1; + break; case ELM_IMAGE_FLIP_TRANSVERSE: - to = data + hw - 1; - w = -w; - hw = hw - 1; - break; + to = data + hw - 1; + w = -w; + hw = hw - 1; + break; case ELM_IMAGE_ROTATE_90_CW: - to = data + w - 1; - hw = -hw - 1; - break; + to = data + w - 1; + hw = -hw - 1; + break; case ELM_IMAGE_ROTATE_90_CCW: - to = data + hw - w; - w = -w; - hw = hw + 1; - break; + to = data + hw - w; + w = -w; + hw = hw + 1; + break; default: - ERR("unknown orient %d", orient); - evas_object_del(tmp); - evas_object_image_data_set(sd->obj, data); // give it back - return; + ERR("unknown orient %d", orient); + evas_object_del(tmp); + evas_object_image_data_set(sd->obj, data); // give it back + return; } from = data2; for (x = iw; --x >= 0;) @@ -423,66 +423,66 @@ if (!sd->obj) return; if (!strcmp(evas_object_type_get(sd->obj), "edje")) { - w = sd->w; - h = sd->h; - x = sd->x; - y = sd->y; - evas_object_move(sd->obj, x, y); - evas_object_resize(sd->obj, w, h); + w = sd->w; + h = sd->h; + x = sd->x; + y = sd->y; + evas_object_move(sd->obj, x, y); + evas_object_resize(sd->obj, w, h); } else { int iw = 0, ih = 0; - evas_object_image_size_get(sd->obj, &iw, &ih); + evas_object_image_size_get(sd->obj, &iw, &ih); - iw = ((double)iw) * sd->scale; - ih = ((double)ih) * sd->scale; + iw = ((double)iw) * sd->scale; + ih = ((double)ih) * sd->scale; - if (iw < 1) iw = 1; - if (ih < 1) ih = 1; + if (iw < 1) iw = 1; + if (ih < 1) ih = 1; - if (sd->fill_inside) - { - w = sd->w; - h = ((double)ih * w) / (double)iw; - if (h > sd->h) - { - h = sd->h; - w = ((double)iw * h) / (double)ih; - } - } - else - { - w = sd->w; - h = ((double)ih * w) / (double)iw; - if (h < sd->h) - { - h = sd->h; - w = ((double)iw * h) / (double)ih; - } - } - if (!sd->scale_up) - { - if ((w > iw) || (h > ih)) - { - w = iw; - h = ih; - } - } - if (!sd->scale_down) - { - if ((w < iw) || (h < ih)) - { - w = iw; - h = ih; - } - } - x = sd->x + ((sd->w - w) / 2); - y = sd->y + ((sd->h - h) / 2); - evas_object_move(sd->obj, x, y); - evas_object_image_fill_set(sd->obj, 0, 0, w, h); - evas_object_resize(sd->obj, w, h); + if (sd->fill_inside) + { + w = sd->w; + h = ((double)ih * w) / (double)iw; + if (h > sd->h) + { + h = sd->h; + w = ((double)iw * h) / (double)ih; + } + } + else + { + w = sd->w; + h = ((double)ih * w) / (double)iw; + if (h < sd->h) + { + h = sd->h; + w = ((double)iw * h) / (double)ih; + } + } + if (!sd->scale_up) + { + if ((w > iw) || (h > ih)) + { + w = iw; + h = ih; + } + } + if (!sd->scale_down) + { + if ((w < iw) || (h < ih)) + { + w = iw; + h = ih; + } + } + x = sd->x + ((sd->w - w) / 2); + y = sd->y + ((sd->h - h) / 2); + evas_object_move(sd->obj, x, y); + evas_object_image_fill_set(sd->obj, 0, 0, w, h); + evas_object_resize(sd->obj, w, h); } } @@ -491,28 +491,28 @@ { if (_e_smart) return; { - static const Evas_Smart_Class sc = - { - "e_icon", - EVAS_SMART_CLASS_VERSION, - _smart_add, - _smart_del, - _smart_move, - _smart_resize, - _smart_show, - _smart_hide, - _smart_color_set, - _smart_clip_set, - _smart_clip_unset, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - }; - _e_smart = evas_smart_class_new(&sc); + static const Evas_Smart_Class sc = + { + "e_icon", + EVAS_SMART_CLASS_VERSION, + _smart_add, + _smart_del, + _smart_move, + _smart_resize, + _smart_show, + _smart_hide, + _smart_color_set, + _smart_clip_set, + _smart_clip_unset, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL + }; + _e_smart = evas_smart_class_new(&sc); } } Modified: trunk/elementary/src/lib/els_scroller.c =================================================================== --- trunk/elementary/src/lib/els_scroller.c 2011-04-01 09:08:11 UTC (rev 58247) +++ trunk/elementary/src/lib/els_scroller.c 2011-04-01 11:08:31 UTC (rev 58248) @@ -21,23 +21,23 @@ Evas_Object *event_obj; Evas_Object *widget; - + Elm_Smart_Scroller_Policy hbar_flags, vbar_flags; struct { - Evas_Coord x, y; - Evas_Coord sx, sy; - Evas_Coord dx, dy; - Evas_Coord pdx, pdy; - Evas_Coord bx, by; - Evas_Coord ax, ay; - Evas_Coord bx0, by0; - Evas_Coord b0x, b0y; - Evas_Coord b2x, b2y; - struct { - Evas_Coord x, y; - double timestamp; - } history[20]; + Evas_Coord x, y; + Evas_Coord sx, sy; + Evas_Coord dx, dy; + Evas_Coord pdx, pdy; + Evas_Coord bx, by; + Evas_Coord ax, ay; + Evas_Coord bx0, by0; + Evas_Coord b0x, b0y; + Evas_Coord b2x, b2y; + struct { + Evas_Coord x, y; + double timestamp; + } history[20]; double anim_start; double anim_start2; double anim_start3; @@ -193,8 +193,8 @@ API_ENTRY return; if (sd->child_obj) { - _elm_smart_pan_child_set(sd->pan_obj, NULL); - evas_object_event_callback_del_full(sd->child_obj, EVAS_CALLBACK_DEL, _smart_child_del_hook, sd); + _elm_smart_pan_child_set(sd->pan_obj, NULL); + evas_object_event_callback_del_full(sd->child_obj, EVAS_CALLBACK_DEL, _smart_child_del_hook, sd); } sd->child_obj = child; @@ -205,11 +205,11 @@ if (!sd->pan_obj) { - o = _elm_smart_pan_add(evas_object_evas_get(obj)); - sd->pan_obj = o; - evas_object_smart_callback_add(o, "changed", _smart_pan_changed_hook, sd); - evas_object_smart_callback_add(o, "pan_changed", _smart_pan_pan_changed_hook, sd); - edje_object_part_swallow(sd->edje_obj, "elm.swallow.content", o); + o = _elm_smart_pan_add(evas_object_evas_get(obj)); + sd->pan_obj = o; + evas_object_smart_callback_add(o, "changed", _smart_pan_changed_hook, sd); + evas_object_smart_callback_add(o, "pan_changed", _smart_pan_pan_changed_hook, sd); + edje_object_part_swallow(sd->edje_obj, "elm.swallow.content", o); } sd->pan_func.set = _elm_smart_pan_set; @@ -247,24 +247,24 @@ if (sd->extern_pan) { - if (sd->pan_obj) - { - edje_object_part_unswallow(sd->edje_obj, sd->pan_obj); - sd->pan_obj = NULL; - } + if (sd->pan_obj) + { + edje_object_part_unswallow(sd->edje_obj, sd->pan_obj); + sd->pan_obj = NULL; + } } else { - if (sd->pan_obj) - { - evas_object_del(sd->pan_obj); - sd->pan_obj = NULL; - } + if (sd->pan_obj) + { + evas_object_del(sd->pan_obj); + sd->pan_obj = NULL; + } } if (!pan) { - sd->extern_pan = 0; - return; + sd->extern_pan = 0; + return; } sd->pan_obj = pan; @@ -345,7 +345,7 @@ { ecore_animator_del(sd->scrollto.x.animator); sd->scrollto.x.animator = NULL; - } + } if (sd->scrollto.y.animator) { @@ -646,21 +646,21 @@ dt = t - sd->down.anim_start2; if (dt >= 0.0) { - dt = dt / _elm_config->thumbscroll_bounce_friction; - if (dt > 1.0) dt = 1.0; - p = 1.0 - ((1.0 - dt) * (1.0 - dt)); + dt = dt / _elm_config->thumbscroll_bounce_friction; + if (dt > 1.0) dt = 1.0; + p = 1.0 - ((1.0 - dt) * (1.0 - dt)); elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); dx = sd->down.b2x - sd->down.bx; - dx = (dx * p); - x = sd->down.bx + dx; + dx = (dx * p); + x = sd->down.bx + dx; if (!sd->down.cancelled) elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); if (dt >= 1.0) { if (sd->down.momentum_animator) sd->down.bounce_x_hold = 1; - else if ((!sd->down.bounce_y_animator) && - (!sd->scrollto.y.animator)) + else if ((!sd->down.bounce_y_animator) && + (!sd->scrollto.y.animator)) _smart_anim_stop(sd->smart_obj); sd->down.bounce_x_animator = NULL; sd->down.pdx = 0; @@ -697,7 +697,7 @@ { if (sd->down.momentum_animator) sd->down.bounce_y_hold = 1; - else if ((!sd->down.bounce_x_animator) && + else if ((!sd->down.bounce_x_animator) && (!sd->scrollto.y.animator)) _smart_anim_stop(sd->smart_obj); sd->down.bounce_y_animator = NULL; @@ -765,22 +765,22 @@ if ((sd->down.dir_y) && !can_scroll(sd, sd->down.vdir)) { sd->down.dir_y = 0; - } - } - if ((!sd->down.dir_x) && (!sd->down.dir_y)) - { - sd->down.cancelled = 1; - } + } + } + if ((!sd->down.dir_x) && (!sd->down.dir_y)) + { + sd->down.cancelled = 1; + } */ - dt = dt / (_elm_config->thumbscroll_friction + sd->down.extra_time); - if (dt > 1.0) dt = 1.0; - p = 1.0 - ((1.0 - dt) * (1.0 - dt)); - dx = (sd->down.dx * (_elm_config->thumbscroll_friction + sd->down.extra_time) * p); - dy = (sd->down.dy * (_elm_config->thumbscroll_friction + sd->down.extra_time) * p); + dt = dt / (_elm_config->thumbscroll_friction + sd->down.extra_time); + if (dt > 1.0) dt = 1.0; + p = 1.0 - ((1.0 - dt) * (1.0 - dt)); + dx = (sd->down.dx * (_elm_config->thumbscroll_friction + sd->down.extra_time) * p); + dy = (sd->down.dy * (_elm_config->thumbscroll_friction + sd->down.extra_time) * p); sd->down.ax = dx; sd->down.ay = dy; - x = sd->down.sx - dx; - y = sd->down.sy - dy; + x = sd->down.sx - dx; + y = sd->down.sy - dy; elm_smart_scroller_child_pos_get(sd->smart_obj, &px, &py); if ((sd->down.bounce_x_animator) || (sd->down.bounce_x_hold)) @@ -794,10 +794,10 @@ sd->down.by = sd->down.by0 - dy + sd->down.b0y; y = py; } - elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); + elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); sd->pan_func.max_get(sd->pan_obj, &maxx, &maxy); sd->pan_func.min_get(sd->pan_obj, &minx, &miny); - if (!sd->bounce_horiz) + if (!sd->bounce_horiz) { if (x <= minx) no_bounce_x_end = EINA_TRUE; if ((x - minx) >= maxx) no_bounce_x_end = EINA_TRUE; @@ -807,22 +807,22 @@ if (y <= miny) no_bounce_y_end = EINA_TRUE; if ((y - miny) >= maxy) no_bounce_y_end = EINA_TRUE; } - if ((dt >= 1.0) || + if ((dt >= 1.0) || ((sd->down.bounce_x_hold) && (sd->down.bounce_y_hold)) || (no_bounce_x_end && no_bounce_y_end)) - { + { _smart_anim_stop(sd->smart_obj); _update_wanted_coordinates(sd, px, py); - sd->down.momentum_animator = NULL; + sd->down.momentum_animator = NULL; sd->down.bounce_x_hold = 0; sd->down.bounce_y_hold = 0; sd->down.ax = 0; sd->down.ay = 0; sd->down.pdx = 0; sd->down.pdy = 0; - return ECORE_CALLBACK_CANCEL; - } + return ECORE_CALLBACK_CANCEL; + } } return ECORE_CALLBACK_RENEW; } @@ -856,7 +856,7 @@ if ((py - miny) > my) py = my + miny; b2x = px; b2y = py; - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_x_get(sd->widget))) { if (!sd->down.bounce_x_animator && !sd->bounce_animator_disabled) @@ -878,7 +878,7 @@ } } } - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_y_get(sd->widget))) { if (!sd->down.bounce_y_animator && !sd->bounce_animator_disabled) @@ -1187,7 +1187,7 @@ { API_ENTRY return; Evas_Coord mw, mh; - //Does this API require parent object absolutely? if then remove this exception. + //Does this API require parent object absolutely? if then remove this exception. double parent_scale = parent ? elm_widget_scale_get(parent) : 1; _elm_theme_object_set(parent, sd->edje_obj, clas, group, style); edje_object_scale_set(sd->edje_obj, parent_scale * _elm_config->scale); @@ -1464,9 +1464,9 @@ sd->pan_func.child_size_get(sd->pan_obj, &w, &h); if ((w != sd->child.w) || (h != sd->child.h)) { - sd->child.w = w; - sd->child.h = h; - _smart_scrollbar_size_adjust(sd); + sd->child.w = w; + sd->child.h = h; + _smart_scrollbar_size_adjust(sd); evas_object_size_hint_min_set(sd->smart_obj, sd->child.w, sd->child.h); _elm_smart_scroller_wanted_region_set(sd->smart_obj); } @@ -1574,7 +1574,7 @@ sd = data; ev = event_info; -// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; + // if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; if (_elm_config->thumbscroll_enable) { sd->down.hold = 0; @@ -1609,42 +1609,42 @@ sd->down.bounce_y_animator = NULL; sd->bouncemey = 0; } - if (sd->down.hold_animator) - { - ecore_animator_del(sd->down.hold_animator); - sd->down.hold_animator = NULL; + if (sd->down.hold_animator) + { + ecore_animator_del(sd->down.hold_animator); + sd->down.hold_animator = NULL; _smart_drag_stop(sd->smart_obj); - } - if (sd->down.momentum_animator) - { - ecore_animator_del(sd->down.momentum_animator); - sd->down.momentum_animator = NULL; + } + if (sd->down.momentum_animator) + { + ecore_animator_del(sd->down.momentum_animator); + sd->down.momentum_animator = NULL; sd->down.bounce_x_hold = 0; sd->down.bounce_y_hold = 0; sd->down.ax = 0; sd->down.ay = 0; - } - if (ev->button == 1) - { - sd->down.now = 1; - sd->down.dragged = 0; - sd->down.dir_x = 0; - sd->down.dir_y = 0; - sd->down.x = ev->canvas.x; - sd->down.y = ev->canvas.y; - elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); - sd->down.sx = x; - sd->down.sy = y; - sd->down.locked = 0; - memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 20); + } + if (ev->button == 1) + { + sd->down.now = 1; + sd->down.dragged = 0; + sd->down.dir_x = 0; + sd->down.dir_y = 0; + sd->down.x = ev->canvas.x; + sd->down.y = ev->canvas.y; + elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); + sd->down.sx = x; + sd->down.sy = y; + sd->down.locked = 0; + memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 20); #ifdef EVTIME - sd->down.history[0].timestamp = ev->timestamp / 1000.0; + sd->down.history[0].timestamp = ev->timestamp / 1000.0; #else - sd->down.history[0].timestamp = ecore_loop_time_get(); + sd->down.history[0].timestamp = ecore_loop_time_get(); #endif - sd->down.history[0].x = ev->canvas.x; - sd->down.history[0].y = ev->canvas.y; - } + sd->down.history[0].x = ev->canvas.x; + sd->down.history[0].y = ev->canvas.y; + } sd->down.dragged_began = 0; sd->down.hold_parent = 0; sd->down.cancelled = 0; @@ -1656,11 +1656,11 @@ { Smart_Data *sd = data; Evas_Coord ox, oy; - + elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy); if (sd->down.dir_x) { - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_x_get(sd->widget))) { ox = sd->down.hold_x; @@ -1668,7 +1668,7 @@ } if (sd->down.dir_y) { - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_y_get(sd->widget))) { oy = sd->down.hold_y; @@ -1703,20 +1703,20 @@ sd = data; ev = event_info; sd->down.hold_parent = 0; -// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; + // if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; evas_post_event_callback_push(e, _smart_event_post_up, sd); // FIXME: respect elm_widget_scroll_hold_get of parent container if (_elm_config->thumbscroll_enable) { - if (ev->button == 1) - { + if (ev->button == 1) + { if (sd->down.onhold_animator) { ecore_animator_del(sd->down.onhold_animator); sd->down.onhold_animator = NULL; } - x = ev->canvas.x - sd->down.x; - y = ev->canvas.y - sd->down.y; + x = ev->canvas.x - sd->down.x; + y = ev->canvas.y - sd->down.y; if (sd->down.dragged) { _smart_drag_stop(sd->smart_obj); @@ -1775,17 +1775,17 @@ ((sd->down.dx < 0) && (sd->down.pdx < 0)) || ((sd->down.dy > 0) && (sd->down.pdy > 0)) || ((sd->down.dy < 0) && (sd->down.pdy < 0))) - { - double t = ecore_loop_time_get(); - double dt = t - sd->down.anim_start; - - if (dt < 0.0) dt = 0.0; - else if (dt > _elm_config->thumbscroll_friction) - dt = _elm_config->thumbscroll_friction; - sd->down.extra_time = _elm_config->thumbscroll_friction - dt; - } + { + double t = ecore_loop_time_get(); + double dt = t - sd->down.anim_start; + + if (dt < 0.0) dt = 0.0; + else if (dt > _elm_config->thumbscroll_friction) + dt = _elm_config->thumbscroll_friction; + sd->down.extra_time = _elm_config->thumbscroll_friction - dt; + } else - sd->down.extra_time = 0.0; + sd->down.extra_time = 0.0; sd->down.pdx = sd->down.dx; sd->down.pdy = sd->down.dy; ox = -sd->down.dx; @@ -1824,28 +1824,28 @@ Evas_Coord pgx, pgy; elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_x_get(sd->widget))) { pgx = _smart_page_x_get(sd, ox); - if (pgx != x) + if (pgx != x) { ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL; _smart_scrollto_x(sd, _elm_config->page_scroll_friction, pgx); } } - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_y_get(sd->widget))) { pgy = _smart_page_y_get(sd, oy); - if (pgy != y) + if (pgy != y) { ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL; _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy); } } } - } + } else { sd->down.pdx = 0; @@ -1855,13 +1855,13 @@ Evas_Coord pgx, pgy; elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_x_get(sd->widget))) { pgx = _smart_page_x_get(sd, ox); if (pgx != x) _smart_scrollto_x(sd, _elm_config->page_scroll_friction, pgx); } - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_y_get(sd->widget))) { pgy = _smart_page_y_get(sd, oy); @@ -1888,15 +1888,15 @@ sd->down.dir_x = 0; sd->down.dir_y = 0; sd->down.want_dragged = 0; - sd->down.dragged = 0; - sd->down.now = 0; + sd->down.dragged = 0; + sd->down.now = 0; elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y); elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); _update_wanted_coordinates(sd, x, y); if (!_smart_do_page(sd)) bounce_eval(sd); - } + } } } @@ -1918,10 +1918,10 @@ elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy); x = ox; y = oy; - + if (sd->down.dir_x) { - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_x_get(sd->widget))) { sd->down.onhold_vxe += vx; @@ -1929,10 +1929,10 @@ sd->down.onhold_vxe -= (int)sd->down.onhold_vxe; } } - + if (sd->down.dir_y) { - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_y_get(sd->widget))) { sd->down.onhold_vye += vy; @@ -1940,7 +1940,7 @@ sd->down.onhold_vye -= (int)sd->down.onhold_vye; } } - + elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); } sd->down.onhold_tlast = t; @@ -1969,7 +1969,7 @@ } if (sd->down.dir_x) { - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_x_get(sd->widget))) { sd->down.want_dragged = 0; @@ -1985,7 +1985,7 @@ } if (sd->down.dir_y) { - if ((!sd->widget) || + if ((!sd->widget) || (!elm_widget_drag_child_locked_y_get(sd->widget))) { sd->down.want_dragged = 0; @@ -2017,45 +2017,45 @@ sd = data; ev = event_info; -// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; + // if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->down.hold_parent = 1; evas_post_event_callback_push(e, _smart_event_post_move, sd); // FIXME: respect elm_widget_scroll_hold_get of parent container if (_elm_config->thumbscroll_enable) { - if (sd->down.now) - { + if (sd->down.now) + { int dodir = 0; #ifdef SCROLLDBG printf("::: %i %i\n", ev->cur.canvas.x, ev->cur.canvas.y); #endif - memmove(&(sd->down.history[1]), &(sd->down.history[0]), - sizeof(sd->down.history[0]) * 19); + memmove(&(sd->down.history[1]), &(sd->down.history[0]), + sizeof(sd->down.history[0]) * 19); #ifdef EVTIME - sd->down.history[0].timestamp = ev->timestamp / 1000.0; + sd->down.history[0].timestamp = ev->timestamp / 1000.0; #else - sd->down.history[0].timestamp = ecore_loop_time_get(); + sd->down.history[0].timestamp = ecore_loop_time_get(); #endif - sd->down.history[0].x = ev->cur.canvas.x; - sd->down.history[0].y = ev->cur.canvas.y; + sd->down.history[0].x = ev->cur.canvas.x; + sd->down.history[0].y = ev->cur.canvas.y; if (!sd->down.dragged_began) { x = ev->cur.canvas.x - sd->down.x; y = ev->cur.canvas.y - sd->down.y; - + sd->down.hdir = -1; sd->down.vdir = -1; - + if (x > 0) sd->down.hdir = LEFT; else if (x < 0) sd->down.hdir = RIGHT; if (y > 0) sd->down.vdir = UP; else if (y < 0) sd->down.vdir = DOWN; - + if (x < 0) x = -x; if (y < 0) y = -y; - + if ((sd->one_dir_at_a_time) && (!((sd->down.dir_x) || (sd->down.dir_y)))) { @@ -2085,10 +2085,10 @@ } else { -// can_scroll(sd, LEFT); -// can_scroll(sd, RIGHT); -// can_scroll(sd, UP); -// can_scroll(sd, DOWN); + // can_scroll(sd, LEFT); + // can_scroll(sd, RIGHT); + // can_scroll(sd, UP); + // can_scroll(sd, DOWN); sd->down.dir_x = 1; sd->down.dir_y = 1; } @@ -2105,15 +2105,15 @@ { sd->down.want_dragged = 1; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; -// evas_event_feed_hold(e, 1, ev->timestamp, ev->data); -// _smart_drag_start(sd->smart_obj); + // evas_event_feed_hold(e, 1, ev->timestamp, ev->data); + // _smart_drag_start(sd->smart_obj); } if (sd->down.dragged) { ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } -// ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; -// sd->down.dragged = 1; + // ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + // sd->down.dragged = 1; if (sd->down.dir_x) x = sd->down.sx - (ev->cur.canvas.x - sd->down.x); else @@ -2141,33 +2141,33 @@ Evas_Coord minx, miny; sd->pan_func.min_get(sd->pan_obj, &minx, &miny); if (y < miny) - y += (miny - y) * - _elm_config->thumbscroll_border_friction; + y += (miny - y) * + _elm_config->thumbscroll_border_friction; else if (sd->child.h <= sd->h) - y += (sd->down.sy - y) * - _elm_config->thumbscroll_border_friction; + y += (sd->down.sy - y) * + _elm_config->thumbscroll_border_friction; else if ((sd->child.h - sd->h + miny) < y) - y += (sd->child.h - sd->h + miny - y) * - _elm_config->thumbscroll_border_friction; + y += (sd->child.h - sd->h + miny - y) * + _elm_config->thumbscroll_border_friction; if (x < minx) - x += (minx - x) * - _elm_config->thumbscroll_border_friction; + x += (minx - x) * + _elm_config->thumbscroll_border_friction; else if (sd->child.w <= sd->w) - x += (sd->down.sx - x) * - _elm_config->thumbscroll_border_friction; + x += (sd->down.sx - x) * + _elm_config->thumbscroll_border_friction; else if ((sd->child.w - sd->w + minx) < x) - x += (sd->child.w - sd->w + minx - x) * - _elm_config->thumbscroll_border_friction; + x += (sd->child.w - sd->w + minx - x) * + _elm_config->thumbscroll_border_friction; } sd->down.hold_x = x; sd->down.hold_y = y; if (!sd->down.hold_animator) - sd->down.hold_animator = + sd->down.hold_animator = ecore_animator_add(_smart_hold_animator, sd); -// printf("a %i %i\n", sd->down.hold_x, sd->down.hold_y); -// _smart_onhold_animator(sd); -// elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); + // printf("a %i %i\n", sd->down.hold_x, sd->down.hold_y); + // _smart_onhold_animator(sd); + // elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); } else { @@ -2181,7 +2181,7 @@ } } } - } + } else if (!sd->freeze) { Evas_Coord ex, ey, ew, eh; @@ -2194,7 +2194,7 @@ { if (_elm_config->thumbscroll_threshold > 0.0) vx = -(double)(_elm_config->thumbscroll_threshold - x) / - _elm_config->thumbscroll_threshold; + _elm_config->thumbscroll_threshold; else vx = -1.0; } @@ -2202,7 +2202,7 @@ { if (_elm_config->thumbscroll_threshold > 0.0) vx = (double)(_elm_config->thumbscroll_threshold - (ew - x)) / - _elm_config->thumbscroll_threshold; + _elm_config->thumbscroll_threshold; else vx = 1.0; } @@ -2210,7 +2210,7 @@ { if (_elm_config->thumbscroll_threshold > 0.0) vy = -(double)(_elm_config->thumbscroll_threshold - y) / - _elm_config->thumbscroll_threshold; + _elm_config->thumbscroll_threshold; else vy = -1.0; } @@ -2218,7 +2218,7 @@ { if (_elm_config->thumbscroll_threshold > 0.0) vy = (double)(_elm_config->thumbscroll_threshold - (eh - y)) / - _elm_config->thumbscroll_threshold; + _elm_config->thumbscroll_threshold; else vy = 1.0; } @@ -2233,7 +2233,7 @@ sd->down.onhold_tlast = 0.0; sd->down.onhold_animator = ecore_animator_add(_smart_onhold_animator, sd); } -// printf("b %i %i\n", sd->down.hold_x, sd->down.hold_y); + // printf("b %i %i\n", sd->down.hold_x, sd->down.hold_y); } else { @@ -2244,7 +2244,7 @@ } } } - } + } } } @@ -2275,8 +2275,8 @@ edje_object_part_drag_value_set(sd->edje_obj, "elm.dragable.hbar", 0.0, 0.0); if ((!sd->child_obj) && (!sd->extern_pan)) { - edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.vbar", 1.0, 1.0); - edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.hbar", 1.0, 1.0); + edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.vbar", 1.0, 1.0); + edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.hbar", 1.0, 1.0); } if (sd->pan_obj) { @@ -2299,46 +2299,46 @@ evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh); if (sd->vbar_visible) { - if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) - { - if ((sd->child_obj) || (sd->extern_pan)) - { - if (h <= vh) - { - scroll_v_vis_change = 1; - sd->vbar_visible = 0; - } - } - else - { - scroll_v_vis_change = 1; - sd->vbar_visible = 0; - } - } - else if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_OFF) - { - scroll_v_vis_change = 1; - sd->vbar_visible = 0; - } + if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) + { + if ((sd->child_obj) || (sd->extern_pan)) + { + if (h <= vh) + { + scroll_v_vis_change = 1; + sd->vbar_visible = 0; + } + } + else + { + scroll_v_vis_change = 1; + sd->vbar_visible = 0; + } + } + else if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_OFF) + { + scroll_v_vis_change = 1; + sd->vbar_visible = 0; + } } else { - if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) - { - if ((sd->child_obj) || (sd->extern_pan)) - { - if (h > vh) - { - scroll_v_vis_change = 1; - sd->vbar_visible = 1; - } - } - } - else if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_ON) - { - scroll_v_vis_change = 1; - sd->vbar_visible = 1; - } + if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) + { + if ((sd->child_obj) || (sd->extern_pan)) + { + if (h > vh) + { + scroll_v_vis_change = 1; + sd->vbar_visible = 1; + } + } + } + else if (sd->vbar_flags == ELM_SMART_SCROLLER_POLICY_ON) + { + scroll_v_vis_change = 1; + sd->vbar_visible = 1; + } } if (scroll_v_vis_change) { @@ -2368,46 +2368,46 @@ evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh); if (sd->hbar_visible) { - if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) - { - if ((sd->child_obj) || (sd->extern_pan)) - { - if (w <= vw) - { - scroll_h_vis_change = 1; - sd->hbar_visible = 0; - } - } - else - { - scroll_h_vis_change = 1; - sd->hbar_visible = 0; - } - } - else if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_OFF) - { - scroll_h_vis_change = 1; - sd->hbar_visible = 0; - } + if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) + { + if ((sd->child_obj) || (sd->extern_pan)) + { + if (w <= vw) + { + scroll_h_vis_change = 1; + sd->hbar_visible = 0; + } + } + else + { + scroll_h_vis_change = 1; + sd->hbar_visible = 0; + } + } + else if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_OFF) + { + scroll_h_vis_change = 1; + sd->hbar_visible = 0; + } } else { - if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) - { - if ((sd->child_obj) || (sd->extern_pan)) - { - if (w > vw) - { - scroll_h_vis_change = 1; - sd->hbar_visible = 1; - } - } - } - else if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_ON) - { - scroll_h_vis_change = 1; - sd->hbar_visible = 1; - } + if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_AUTO) + { + if ((sd->child_obj) || (sd->extern_pan)) + { + if (w > vw) + { + scroll_h_vis_change = 1; + sd->hbar_visible = 1; + } + } + } + else if (sd->hbar_flags == ELM_SMART_SCROLLER_POLICY_ON) + { + scroll_h_vis_change = 1; + sd->hbar_visible = 1; + } } if (scroll_h_vis_change) { @@ -2422,7 +2422,7 @@ } else edje_object_signal_emit(sd->edje_obj, "elm,action,hide,hbar", "elm"); - _smart_scrollbar_size_adjust(sd); + _smart_scrollbar_size_adjust(sd); } return scroll_h_vis_change; } @@ -2436,8 +2436,8 @@ changed |= _smart_scrollbar_bar_v_visibility_adjust(sd); if (changed) { - _smart_scrollbar_bar_h_visibility_adjust(sd); - _smart_scrollbar_bar_v_visibility_adjust(sd); + _smart_scrollbar_bar_h_visibility_adjust(sd); + _smart_scrollbar_bar_v_visibility_adjust(sd); } } @@ -2446,67 +2446,67 @@ { if ((sd->child_obj) || (sd->extern_pan)) { - Evas_Coord x, y, w, h, mx = 0, my = 0, vw = 0, vh = 0, px, py, minx = 0, miny = 0; - double vx, vy, size; + Evas_Coord x, y, w, h, mx = 0, my = 0, vw = 0, vh = 0, px, py, minx = 0, miny = 0; + double vx, vy, size; - edje_object_part_geometry_get(sd->edje_obj, "elm.swallow.content", - NULL, NULL, &vw, &vh); - w = sd->child.w; - if (w < 1) w = 1; - size = (double)vw / (double)w; - if (size > 1.0) - { - size = 1.0; - edje_object_part_drag_value_set(sd->edje_obj, "elm.dragable.hbar", 0.0, 0.0); - } - edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.hbar", size, 1.0); + edje_object_part_geometry_get(sd->edje_obj, "elm.swallow.content", + NULL, NULL, &vw, &vh); + w = sd->child.w; + if (w < 1) w = 1; + size = (double)vw / (double)w; + if (size > 1.0) + { + size = 1.0; + edje_object_part_drag_value_set(sd->edje_obj, "elm.dragable.hbar", 0.0, 0.0); + } + edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.hbar", size, 1.0); - h = sd->child.h; - if (h < 1) h = 1; - size = (double)vh / (double)h; - if (size > 1.0) - { - size = 1.0; - edje_object_part_drag_value_set(sd->edje_obj, "elm.dragable.vbar", 0.0, 0.0); - } - edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.vbar", 1.0, size); + h = sd->child.h; + if (h < 1) h = 1; + size = (double)vh / (double)h; + if (size > 1.0) + { + size = 1.0; + edje_object_part_drag_value_set(sd->edje_obj, "elm.dragable.vbar", 0.0, 0.0); + } + edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.vbar", 1.0, size); - edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.hbar", &vx, NULL); - edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.vbar", NULL, &vy); - sd->pan_func.max_get(sd->pan_obj, &mx, &my); - sd->pan_func.min_get(sd->pan_obj, &minx, &miny); - x = vx * mx + minx; - y = vy * my + miny; + edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.hbar", &vx, NULL); + edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.vbar", NULL, &vy); + sd->pan_func.max_get(sd->pan_obj, &mx, &my); + sd->pan_func.min_get(sd->pan_obj, &minx, &miny); + x = vx * mx + minx; + y = vy * my + miny; - edje_object_part_drag_step_set(sd->edje_obj, "elm.dragable.hbar", (double)sd->step.x / (double)w, 0.0); - edje_object_part_drag_step_set(sd->edje_obj, "elm.dragable.vbar", 0.0, (double)sd->step.y / (double)h); - if (sd->page.x > 0) - edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.hbar", (double)sd->page.x / (double)w, 0.0); - else - edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.hbar", -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0); - if (sd->page.y > 0) - edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.vbar", 0.0, (double)sd->page.y / (double)h); - else - edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.vbar", 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0); + edje_object_part_drag_step_set(sd->edje_obj, "elm.dragable.hbar", (double)sd->step.x / (double)w, 0.0); + edje_object_part_drag_step_set(sd->edje_obj, "elm.dragable.vbar", 0.0, (double)sd->step.y / (double)h); + if (sd->page.x > 0) + edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.hbar", (double)sd->page.x / (double)w, 0.0); + else + edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.hbar", -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0); + if (sd->page.y > 0) + edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.vbar", 0.0, (double)sd->page.y / (double)h); + else + edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.vbar", 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0); - sd->pan_func.get(sd->pan_obj, &px, &py); + sd->pan_func.get(sd->pan_obj, &px, &py); if (vx != mx) x = px; if (vy != my) y = py; - sd->pan_func.set(sd->pan_obj, x, y); -// if ((px != 0) || (py != 0)) -// edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm"); + sd->pan_func.set(sd->pan_obj, x, y); + // if ((px != 0) || (py != 0)) + // edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm"); } else { - Evas_Coord px = 0, py = 0, minx = 0, miny = 0; + Evas_Coord px = 0, py = 0, minx = 0, miny = 0; - edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.vbar", 1.0, 1.0); - edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.hbar", 1.0, 1.0); + edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.vbar", 1.0, 1.0); + edje_object_part_drag_size_set(sd->edje_obj, "elm.dragable.hbar", 1.0, 1.0); sd->pan_func.min_get(sd->pan_obj, &minx, &miny); - sd->pan_func.get(sd->pan_obj, &px, &py); - sd->pan_func.set(sd->pan_obj, minx, miny); + sd->pan_func.get(sd->pan_obj, &px, &py); + sd->pan_func.set(sd->pan_obj, minx, miny); if ((px != minx) || (py != miny)) - edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm"); + edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm"); } _smart_scrollbar_bar_visibility_adjust(sd); } @@ -2551,7 +2551,7 @@ sd->one_dir_at_a_time = 1; sd->momentum_animator_disabled = 0; sd->bounce_animator_disabled = 0; - + o = edje_object_add(evas_object_evas_get(obj)); evas_object_propagate_events_set(o, 0); sd->edje_obj = o; @@ -2671,28 +2671,28 @@ { if (_smart) return; { - static const Evas_Smart_Class sc = - { - SMART_NAME, - EVAS_SMART_CLASS_VERSION, - _smart_add, - _smart_del, - _smart_move, - _smart_resize, - _smart_show, - _smart_hide, - _smart_color_set, - _smart_clip_set, - _smart_clip_unset, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - }; - _smart = evas_smart_class_new(&sc); + static const Evas_Smart_Class sc = + { + SMART_NAME, + EVAS_SMART_CLASS_VERSION, + _smart_add, + _smart_del, + _smart_move, + _smart_resize, + _smart_show, + _smart_hide, + _smart_color_set, + _smart_clip_set, + _smart_clip_unset, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL + }; + _smart = evas_smart_class_new(&sc); } } |
From: Enlightenment S. <no-...@en...> - 2011-04-01 11:20:28
|
Log: elementary/theme, widget, win, toolbar, thumb, toggle, util, box - removed white spaces Author: hermet Date: 2011-04-01 04:20:18 -0700 (Fri, 01 Apr 2011) New Revision: 58249 Trac: http://trac.enlightenment.org/e/changeset/58249 Modified: trunk/elementary/src/lib/elm_table.c trunk/elementary/src/lib/elm_theme.c trunk/elementary/src/lib/elm_thumb.c trunk/elementary/src/lib/elm_toggle.c trunk/elementary/src/lib/elm_toolbar.c trunk/elementary/src/lib/elm_util.c trunk/elementary/src/lib/elm_widget.c trunk/elementary/src/lib/elm_win.c trunk/elementary/src/lib/els_box.c Modified: trunk/elementary/src/lib/elm_table.c =================================================================== --- trunk/elementary/src/lib/elm_table.c 2011-04-01 11:08:31 UTC (rev 58248) +++ trunk/elementary/src/lib/elm_table.c 2011-04-01 11:20:18 UTC (rev 58249) @@ -141,7 +141,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "table"); elm_widget_type_set(obj, "table"); elm_widget_sub_object_add(parent, obj); @@ -155,7 +155,7 @@ wd->tbl = evas_object_table_add(e); evas_object_event_callback_add(wd->tbl, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + _changed_size_hints, obj); elm_widget_resize_object_set(obj, wd->tbl); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); Modified: trunk/elementary/src/lib/elm_theme.c =================================================================== --- trunk/elementary/src/lib/elm_theme.c 2011-04-01 11:08:31 UTC (rev 58248) +++ trunk/elementary/src/lib/elm_theme.c 2011-04-01 11:20:18 UTC (rev 58249) @@ -26,21 +26,21 @@ eina_stringshare_del(p); if (th->cache) { - eina_hash_free(th->cache); - th->cache = NULL; + eina_hash_free(th->cache); + th->cache = NULL; } if (th->theme) { eina_stringshare_del(th->theme); th->theme = NULL; } - if (th->ref_theme) - { - th->ref_theme->referrers = - eina_list_remove(th->ref_theme->referrers, th); - elm_theme_free(th->ref_theme); - th->ref_theme = NULL; - } + if (th->ref_theme) + { + th->ref_theme->referrers = + eina_list_remove(th->ref_theme->referrers, th); + elm_theme_free(th->ref_theme); + th->ref_theme = NULL; + } } static const char * @@ -50,12 +50,12 @@ if (edje_file_group_exists(f, group)) { - file = eina_stringshare_add(f); - if (file) - { - eina_hash_add(th->cache, group, file); - return file; - } + file = eina_stringshare_add(f); + if (file) + { + eina_hash_add(th->cache, group, file); + return file; + } } return NULL; } @@ -72,8 +72,8 @@ return _elm_theme_find_try(th, f, group); else if (((f[0] == '~') && (f[1] == '/'))) { - snprintf(buf, sizeof(buf), "%s/%s", home, f + 2); - return _elm_theme_find_try(th, buf, group); + snprintf(buf, sizeof(buf), "%s/%s", home, f + 2); + return _elm_theme_find_try(th, buf, group); } snprintf(buf, sizeof(buf), "%s/.elementary/themes/%s.edj", home, f); file = _elm_theme_find_try(th, buf, group); @@ -94,23 +94,23 @@ if (file) return file; if (!home) { - home = getenv("HOME"); - if (!home) home = ""; + home = getenv("HOME"); + if (!home) home = ""; } EINA_LIST_FOREACH(th->overlay, l, f) { - file = _elm_theme_theme_element_try(th, home, f, group); - if (file) return file; + file = _elm_theme_theme_element_try(th, home, f, group); + if (file) return file; } EINA_LIST_FOREACH(th->themes, l, f) { - file = _elm_theme_theme_element_try(th, home, f, group); - if (file) return file; + file = _elm_theme_theme_element_try(th, home, f, group); + if (file) return file; } EINA_LIST_FOREACH(th->extension, l, f) { - file = _elm_theme_theme_element_try(th, home, f, group); - if (file) return file; + file = _elm_theme_theme_element_try(th, home, f, group); + if (file) return file; } if (th->ref_theme) return _elm_theme_group_file_find(th->ref_theme, group); return NULL; @@ -144,8 +144,8 @@ file = _elm_theme_group_file_find(th, buf2); if (file) { - ok = edje_object_file_set(o, file, buf2); - if (ok) return EINA_TRUE; + ok = edje_object_file_set(o, file, buf2); + if (ok) return EINA_TRUE; else DBG("could not set theme group '%s' from file '%s': %s", buf2, file, edje_load_error_str(edje_object_load_error_get(o))); @@ -172,9 +172,9 @@ file = _elm_theme_group_file_find(th, buf2); if (file) { - _els_smart_icon_file_edje_set(o, file, buf2); - _els_smart_icon_size_get(o, &w, &h); - if (w > 0) return EINA_TRUE; + _els_smart_icon_file_edje_set(o, file, buf2); + _els_smart_icon_size_get(o, &w, &h); + if (w > 0) return EINA_TRUE; } snprintf(buf2, sizeof(buf2), "elm/icon/%s/default", group); file = _elm_theme_group_file_find(th, buf2); @@ -224,8 +224,8 @@ p = eina_list_data_get(eina_list_last(names)); if ((!p) || ((p) && (strcmp(p, "default")))) { - p = eina_stringshare_add("default"); - if (p) names = eina_list_append(names, p); + p = eina_stringshare_add("default"); + if (p) names = eina_list_append(names, p); } if (th->cache) eina_hash_free(th->cache); th->cache = eina_hash_string_superfast_new(EINA_FREE_CB(eina_stringshare_del)); @@ -244,7 +244,7 @@ /** * Create a new specific theme - * + * * This creates an empty specific theme that only uses the default theme. A * specific theme has its own private set of extensions and overlays too * (which are empty by default). Specific themes do not fall back to themes @@ -256,7 +256,7 @@ * actually apply it yet. The child of the scroller will have a specific * theme set to show this preview before the user decides to apply it to all * applications). - * + * * @ingroup Theme */ EAPI Elm_Theme * @@ -272,11 +272,11 @@ /** * Free a specific theme - * + * * @param th The theme to free - * + * * This frees a theme created with elm_theme_new(). - * + * * @ingroup Theme */ EAPI void @@ -294,10 +294,10 @@ /** * Copy the theme fom the source to the destination theme - * + * * @param th The source theme to copy from * @param thdst The destination theme to copy data to - * + * * This makes a one-time static copy of all the theme config, extensions * and overlays from @p th to @p thdst. If @p th references a theme, then * @p thdst is also set to reference it, with all the theme settings, @@ -308,31 +308,31 @@ { const Eina_List *l; const char *f; - + if (!th) th = &(theme_default); if (!thdst) thdst = &(theme_default); _elm_theme_clear(thdst); if (th->ref_theme) { - thdst->ref_theme = th->ref_theme; - thdst->ref_theme->referrers = - eina_list_append(thdst->ref_theme->referrers, thdst); - thdst->ref_theme->ref++; + thdst->ref_theme = th->ref_theme; + thdst->ref_theme->referrers = + eina_list_append(thdst->ref_theme->referrers, thdst); + thdst->ref_theme->ref++; } EINA_LIST_FOREACH(th->overlay, l, f) { - const char *s = eina_stringshare_add(f); - if (s) thdst->overlay = eina_list_append(thdst->overlay, s); + const char *s = eina_stringshare_add(f); + if (s) thdst->overlay = eina_list_append(thdst->overlay, s); } EINA_LIST_FOREACH(th->themes, l, f) { - const char *s = eina_stringshare_add(f); - if (s) thdst->themes = eina_list_append(thdst->themes, s); + const char *s = eina_stringshare_add(f); + if (s) thdst->themes = eina_list_append(thdst->themes, s); } EINA_LIST_FOREACH(th->extension, l, f) { - const char *s = eina_stringshare_add(f); - if (s) thdst->extension = eina_list_append(thdst->extension, s); + const char *s = eina_stringshare_add(f); + if (s) thdst->extension = eina_list_append(thdst->extension, s); } if (th->theme) thdst->theme = eina_stringshare_add(th->theme); elm_theme_flush(thdst); @@ -340,10 +340,10 @@ /** * Tell the source theme to reference the ref theme - * + * * @param th The theme that will do the referencing * @param thref The theme that is the reference source - * + * * This clears @p th to be empty and then sets it to refer to @p thref * so @p th acts as an override to @p thdst, but where its overrides * don't apply, it will fall through to @pthref for configuration. @@ -357,8 +357,8 @@ _elm_theme_clear(th); if (thref) { - thref->referrers = eina_list_append(thref->referrers, th); - thref->ref++; + thref->referrers = eina_list_append(thref->referrers, th); + thref->ref++; } th->ref_theme = thref; elm_theme_flush(th); @@ -366,10 +366,10 @@ /** * Return the theme referred to - * + * * @param th The theme to get the reference from * @return The referenced theme handle - * + * * This gets the theme set as the reference theme by elm_theme_ref_set(). * If no theme is set as a reference, NULL is returned. */ @@ -382,9 +382,9 @@ /** * Return the default theme - * + * * @return The default theme handle - * + * * This returns the internal default theme setup handle that all widgets * use implicitly unless a specific theme is set. This is also often use * as a shorthand of NULL. @@ -400,7 +400,7 @@ * * @param th The theme to add to, or if NULL, the default theme * @param item The Edje file path to be used - * + * * Use this if your application needs to provide some custom overlay theme * (An Edje file that replaces some default styles of widgets) where adding * new styles, or changing system theme configuration is not possible. Do @@ -429,7 +429,7 @@ * @param item The name of the theme overlay * * See elm_theme_overlay_add(). - * + * * @ingroup Theme */ EAPI void @@ -441,12 +441,12 @@ if (!th) th = &(theme_default); s = eina_stringshare_add(item); EINA_LIST_FOREACH(th->overlay, l, f) - if (f == s) - { - eina_stringshare_del(f); - th->overlay = eina_list_remove_list(th->overlay, (Eina_List *)l); - break; - } + if (f == s) + { + eina_stringshare_del(f); + th->overlay = eina_list_remove_list(th->overlay, (Eina_List *)l); + break; + } eina_stringshare_del(s); elm_theme_flush(th); } @@ -467,7 +467,7 @@ * path to be search after the default theme. The use of this call is * encouraged when default styles do not meet the needs of the application. * Use this call instead of elm_theme_overlay_add() for almost all cases. - * + * * @ingroup Theme */ EAPI void @@ -485,7 +485,7 @@ * * @param th The theme to delete from, or if NULL, the default theme * @param item The name of the theme extension - * + * * See elm_theme_extension_add(). * * @ingroup Theme @@ -499,29 +499,29 @@ if (!th) th = &(theme_default); s = eina_stringshare_add(item); EINA_LIST_FOREACH(th->extension, l, f) - if (f == s) - { - eina_stringshare_del(f); - th->extension = eina_list_remove_list(th->extension, (Eina_List *)l); - break; - } + if (f == s) + { + eina_stringshare_del(f); + th->extension = eina_list_remove_list(th->extension, (Eina_List *)l); + break; + } eina_stringshare_del(s); elm_theme_flush(th); } /** * Set the theme search order for the given theme - * + * * @param th The theme to set the search order, or if NULL, the default theme * @param theme Theme search string - * + * * This sets the search string for the theme in path-notation from first * theme to search, to last, delimited by the : character. Example: - * + * * "shiny:/path/to/file.edj:default" - * + * * See the ELM_THEME environment variable for more information. - * + * * @ingroup Theme */ EAPI void @@ -539,12 +539,12 @@ /** * Return the theme search order - * + * * @param th The theme to get the search order, or if NULL, the default theme * @return The internal search order path - * + * * See elm_theme_set() for more information. - * + * * @ingroup Theme */ EAPI const char * @@ -578,10 +578,10 @@ /** * Return a list of theme elements to be used in a theme. - * + * * @param th Theme to get the list of theme elements from. * @return The internal list of theme elements - * + * * This returns the internal list of theme elements (will only be valid as * long as the theme is not modified by elm_theme_set() or theme is not * freed by elm_theme_free(). This is a list of strings which must not be @@ -597,11 +597,11 @@ /** * Return the full patrh for a theme element - * + * * @param f The theme element name * @param in_search_path Pointer to a boolean to indicate if item is in the search path or not * @return The full path to the file found. - * + * * This returns a string you should free with free() on success, NULL on * failure. This will search for the given theme element, and if it is a * full or relative path element or a simple searchable name. The returned @@ -616,19 +616,19 @@ { static const char *home = NULL; char buf[PATH_MAX]; - + if (!f) { if (in_search_path) *in_search_path = EINA_FALSE; return NULL; } - + if (!home) { - home = getenv("HOME"); - if (!home) home = ""; + home = getenv("HOME"); + if (!home) home = ""; } - + if ((f[0] == '/') || ((f[0] == '.') && (f[1] == '/')) || ((f[0] == '.') && (f[1] == '.') && (f[2] == '/')) || ((isalpha(f[0])) && (f[1] == ':'))) @@ -639,7 +639,7 @@ else if (((f[0] == '~') && (f[1] == '/'))) { if (in_search_path) *in_search_path = EINA_FALSE; - snprintf(buf, sizeof(buf), "%s/%s", home, f + 2); + snprintf(buf, sizeof(buf), "%s/%s", home, f + 2); return strdup(buf); } snprintf(buf, sizeof(buf), "%s/.elementary/themes/%s.edj", home, f); @@ -648,23 +648,23 @@ if (in_search_path) *in_search_path = EINA_TRUE; return strdup(buf); } - + snprintf(buf, sizeof(buf), "%s/themes/%s.edj", _elm_data_dir, f); if (ecore_file_exists(buf)) { if (in_search_path) *in_search_path = EINA_TRUE; return strdup(buf); } - + if (in_search_path) *in_search_path = EINA_FALSE; return NULL; } /** * Flush the current theme. - * + * * @param th Theme to flush - * + * * This flushes caches that let elementary know where to find theme elements * in the given theme. If @p th is NULL, then the default theme is flushed. * Call this call if source theme data has changed in such a way as to @@ -690,10 +690,10 @@ /** * This flushes all themes (default and specific ones). - * + * * This will flush all themes in the current application context, by calling * elm_theme_flush() on each of them. - * + * * @ingroup Theme */ EAPI void @@ -701,7 +701,7 @@ { Eina_List *l; Elm_Theme *th; - + EINA_LIST_FOREACH(themes, l, th) { elm_theme_flush(th); @@ -722,7 +722,7 @@ { #ifdef HAVE_ELEMENTARY_X static Ecore_X_Atom atom = 0; - + if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_THEME"); ecore_x_window_prop_string_set(ecore_x_window_root_first_get(), atom, theme); @@ -732,12 +732,12 @@ /** * Return a list of theme elements in the theme search path - * + * * @return A list of strings that are the theme element names. - * + * * This lists all available theme files in the standard Elementary search path * for theme elements, and returns them in alphabetical order as theme - * element names in a list of strings. Free this with + * element names in a list of strings. Free this with * elm_theme_name_available_list_free() when you are done with the list. */ EAPI Eina_List * @@ -747,13 +747,13 @@ Eina_List *dir, *l; char buf[PATH_MAX], *file, *s, *th; static const char *home = NULL; - + if (!home) { home = getenv("HOME"); if (!home) home = ""; } - + snprintf(buf, sizeof(buf), "%s/.elementary/themes", home); dir = ecore_file_ls(buf); EINA_LIST_FREE(dir, file) @@ -784,7 +784,7 @@ if ((s) && (!strcasecmp(s, ".edj"))) { int dup; - + th = strdup(file); s = strchr(th, '.'); *s = 0; @@ -809,8 +809,8 @@ /** * Free the list returned by elm_theme_name_available_list_new() - * - * This frees the list of themes returned by + * + * This frees the list of themes returned by * elm_theme_name_available_list_new(). Once freed the list should no longer * be used. a new list mys be created. */ @@ -823,19 +823,19 @@ /** * Set a specific theme to be used for this object and its children - * + * * @param obj The object to set the theme on * @param th The theme to set - * + * * This sets a specific theme that will be used for the given object and any * child objects it has. If @p th is NULL then the theme to be used is * cleared and the object will inherit its theme from its parent (which * ultimately will use the default theme if no specific themes are set). - * + * * Use special themes with great care as this will annoy users and make * configuration difficult. Avoid any custom themes at all if it can be * helped. - * + * * @ingroup Theme */ EAPI void @@ -847,15 +847,15 @@ /** * Get the specific theme to be used - * + * * @param obj The object to get the specific theme from * @return The specifc theme set. - * + * * This will return a specific theme set, or NULL if no specific theme is * set on that object. It will not return inherited themes from parents, only * the specific theme set for that specific object. See elm_object_theme_set() * for more information. - * + * * @ingroup Theme */ EAPI Elm_Theme * Modified: trunk/elementary/src/lib/elm_thumb.c =================================================================== --- trunk/elementary/src/lib/elm_thumb.c 2011-04-01 11:08:31 UTC (rev 58248) +++ trunk/elementary/src/lib/elm_thumb.c 2011-04-01 11:20:18 UTC (rev 58249) @@ -38,9 +38,9 @@ const char *key; struct { - int id; - const char *file; - const char *key; + int id; + const char *file; + const char *key; } thumb; Ecore_Event_Handler *eeh; Elm_Thumb_Animation_Setting anim_setting; @@ -60,16 +60,16 @@ #define SIG_LOAD_ERROR "load,error" #define SIG_PRESS "press" -static const Evas_Smart_Cb_Description _signals[] = +static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CLICKED, ""}, - {SIG_CLICKED_DOUBLE, ""}, - {SIG_GENERATE_ERROR, ""}, - {SIG_GENERATE_START, ""}, - {SIG_GENERATE_STOP, ""}, - {SIG_LOAD_ERROR, ""}, - {SIG_PRESS, ""}, - {NULL, NULL} + {SIG_CLICKED, ""}, + {SIG_CLICKED_DOUBLE, ""}, + {SIG_GENERATE_ERROR, ""}, + {SIG_GENERATE_START, ""}, + {SIG_GENERATE_STOP, ""}, + {SIG_LOAD_ERROR, ""}, + {SIG_PRESS, ""}, + {NULL, NULL} }; #define EDJE_SIGNAL_GENERATE_START "elm,thumb,generate,start" @@ -105,7 +105,7 @@ _theme_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - _elm_theme_object_set(obj, wd->frame, "thumb", "base", + _elm_theme_object_set(obj, wd->frame, "thumb", "base", elm_widget_style_get(obj)); } @@ -156,52 +156,52 @@ evas = evas_object_evas_get(wd->self); if ((wd->view) && (wd->is_video ^ wd->was_video)) { - evas_object_del(wd->view); - wd->view = NULL; + evas_object_del(wd->view); + wd->view = NULL; } wd->was_video = wd->is_video; if ((wd->is_video) && (ethumb_client_format_get(_elm_ethumb_client) == ETHUMB_THUMB_EET)) { - if (!wd->view) - { - wd->view = edje_object_add(evas); - if (!wd->view) - { - ERR("could not create edje object"); - goto err; - } - new_view = EINA_TRUE; - } + if (!wd->view) + { + wd->view = edje_object_add(evas); + if (!wd->view) + { + ERR("could not create edje object"); + goto err; + } + new_view = EINA_TRUE; + } - if (!edje_object_file_set(wd->view, thumb_path, "movie/thumb")) - { - ERR("could not set file=%s key=%s for %s", thumb_path, thumb_key, - wd->file); - goto view_err; - } + if (!edje_object_file_set(wd->view, thumb_path, "movie/thumb")) + { + ERR("could not set file=%s key=%s for %s", thumb_path, thumb_key, + wd->file); + goto view_err; + } } else { - if (!wd->view) - { - wd->view = evas_object_image_filled_add(evas); - if (!wd->view) - { - ERR("could not create image object"); - goto err; - } - new_view = EINA_TRUE; - } + if (!wd->view) + { + wd->view = evas_object_image_filled_add(evas); + if (!wd->view) + { + ERR("could not create image object"); + goto err; + } + new_view = EINA_TRUE; + } - evas_object_image_file_set(wd->view, thumb_path, thumb_key); - r = evas_object_image_load_error_get(wd->view); - if (r != EVAS_LOAD_ERROR_NONE) - { - ERR("%s: %s", thumb_path, evas_load_error_str(r)); - goto view_err; - } + evas_object_image_file_set(wd->view, thumb_path, thumb_key); + r = evas_object_image_load_error_get(wd->view); + if (r != EVAS_LOAD_ERROR_NONE) + { + ERR("%s: %s", thumb_path, evas_load_error_str(r)); + goto view_err; + } } if (new_view) elm_widget_sub_object_add(wd->self, wd->view); @@ -235,8 +235,8 @@ if (success) { - _finished_thumb(wd, thumb_path, thumb_key); - return; + _finished_thumb(wd, thumb_path, thumb_key); + return; } ERR("could not generate thumbnail for %s (key: %s)", file, key ? key : ""); @@ -250,7 +250,7 @@ if (wd->thumb.id > 0) { ethumb_client_generate_cancel - (_elm_ethumb_client, wd->thumb.id, NULL, NULL, NULL); + (_elm_ethumb_client, wd->thumb.id, NULL, NULL, NULL); wd->thumb.id = -1; } @@ -259,26 +259,26 @@ ethumb_client_file_set(_elm_ethumb_client, wd->file, wd->key); if (ethumb_client_thumb_exists(_elm_ethumb_client)) { - const char *thumb_path, *thumb_key; + const char *thumb_path, *thumb_key; - wd->thumb.id = -1; - ethumb_client_thumb_path_get(_elm_ethumb_client, &thumb_path, - &thumb_key); - _finished_thumb(wd, thumb_path, thumb_key); - return; + wd->thumb.id = -1; + ethumb_client_thumb_path_get(_elm_ethumb_client, &thumb_path, + &thumb_key); + _finished_thumb(wd, thumb_path, thumb_key); + return; } else if ((wd->thumb.id = ethumb_client_generate - (_elm_ethumb_client, _finished_thumb_cb, wd, NULL)) != -1) + (_elm_ethumb_client, _finished_thumb_cb, wd, NULL)) != -1) { - edje_object_signal_emit(wd->frame, EDJE_SIGNAL_PULSE_START, "elm"); - edje_object_signal_emit(wd->frame, EDJE_SIGNAL_GENERATE_START, "elm"); - evas_object_smart_callback_call(wd->self, SIG_GENERATE_START, NULL); + edje_object_signal_emit(wd->frame, EDJE_SIGNAL_PULSE_START, "elm"); + edje_object_signal_emit(wd->frame, EDJE_SIGNAL_GENERATE_START, "elm"); + evas_object_smart_callback_call(wd->self, SIG_GENERATE_START, NULL); } else { - wd->thumb.id = -1; - edje_object_signal_emit(wd->frame, EDJE_SIGNAL_GENERATE_ERROR, "elm"); - evas_object_smart_callback_call(wd->self, SIG_GENERATE_ERROR, NULL); + wd->thumb.id = -1; + edje_object_signal_emit(wd->frame, EDJE_SIGNAL_GENERATE_ERROR, "elm"); + evas_object_smart_callback_call(wd->self, SIG_GENERATE_ERROR, NULL); } } @@ -296,13 +296,13 @@ if (elm_thumb_ethumb_client_connected()) { - _thumb_apply(wd); - return; + _thumb_apply(wd); + return; } if (!wd->eeh) wd->eeh = ecore_event_handler_add(ELM_ECORE_EVENT_ETHUMB_CONNECT, - _thumb_apply_cb, wd); + _thumb_apply_cb, wd); } static void @@ -320,18 +320,18 @@ if (wd->thumb.id >= 0) { - ethumb_client_generate_cancel - (_elm_ethumb_client, wd->thumb.id, NULL, NULL, NULL); - wd->thumb.id = -1; + ethumb_client_generate_cancel + (_elm_ethumb_client, wd->thumb.id, NULL, NULL, NULL); + wd->thumb.id = -1; - edje_object_signal_emit(wd->frame, EDJE_SIGNAL_GENERATE_STOP, "elm"); - evas_object_smart_callback_call(wd->self, SIG_GENERATE_STOP, NULL); + edje_object_signal_emit(wd->frame, EDJE_SIGNAL_GENERATE_STOP, "elm"); + evas_object_smart_callback_call(wd->self, SIG_GENERATE_STOP, NULL); } if (wd->eeh) { - ecore_event_handler_del(wd->eeh); - wd->eeh = NULL; + ecore_event_handler_del(wd->eeh); + wd->eeh = NULL; } } @@ -347,9 +347,9 @@ { if (success) { - ethumb_client_on_server_die_callback_set(c, _on_die_cb, NULL, NULL); - _elm_ethumb_connected = EINA_TRUE; - ecore_event_add(ELM_ECORE_EVENT_ETHUMB_CONNECT, NULL, NULL, NULL); + ethumb_client_on_server_die_callback_set(c, _on_die_cb, NULL, NULL); + _elm_ethumb_connected = EINA_TRUE; + ecore_event_add(ELM_ECORE_EVENT_ETHUMB_CONNECT, NULL, NULL, NULL); } else _elm_ethumb_client = NULL; @@ -426,7 +426,7 @@ Evas_Coord minw, minh; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "thumb"); elm_widget_type_set(obj, "thumb"); elm_widget_sub_object_add(parent, obj); @@ -454,13 +454,13 @@ #ifdef HAVE_ELEMENTARY_ETHUMB evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, - _mouse_down_cb, wd); + _mouse_down_cb, wd); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP, - _mouse_up_cb, wd); + _mouse_up_cb, wd); evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, - _thumb_show_cb, wd); + _thumb_show_cb, wd); evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, - _thumb_hide_cb, wd); + _thumb_hide_cb, wd); #endif // TODO: convert Elementary to subclassing of Evas_Smart_Class @@ -526,25 +526,25 @@ if (file_replaced) { - int prefix_size; - const char **ext, *ptr; - static const char *extensions[] = + int prefix_size; + const char **ext, *ptr; + static const char *extensions[] = { ".avi", ".mp4", ".ogv", ".mov", ".mpg", ".wmv", NULL }; - prefix_size = eina_stringshare_strlen(wd->file) - 4; - if (prefix_size >= 0) - { - ptr = wd->file + prefix_size; - wd->is_video = EINA_FALSE; - for (ext = extensions; *ext; ext++) - if (!strcasecmp(ptr, *ext)) - { - wd->is_video = EINA_TRUE; - break; - } - } + prefix_size = eina_stringshare_strlen(wd->file) - 4; + if (prefix_size >= 0) + { + ptr = wd->file + prefix_size; + wd->is_video = EINA_FALSE; + for (ext = extensions; *ext; ext++) + if (!strcasecmp(ptr, *ext)) + { + wd->is_video = EINA_TRUE; + break; + } + } } eina_stringshare_replace(&(wd->thumb.file), NULL); @@ -730,10 +730,10 @@ wd->edit = edit; if (wd->edit) - elm_drop_target_add(obj, ELM_SEL_FORMAT_IMAGE, - _elm_thumb_dropcb, obj); + elm_drop_target_add(obj, ELM_SEL_FORMAT_IMAGE, + _elm_thumb_dropcb, obj); else - elm_drop_target_del(obj); + elm_drop_target_del(obj); return EINA_TRUE; } Modified: trunk/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/elementary/src/lib/elm_toggle.c 2011-04-01 11:08:31 UTC (rev 58248) +++ trunk/elementary/src/lib/elm_toggle.c 2011-04-01 11:20:18 UTC (rev 58249) @@ -41,8 +41,8 @@ static const char SIG_CHANGED[] = "changed"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CHANGED, ""}, - {NULL, NULL} + {SIG_CHANGED, ""}, + {NULL, NULL} }; static Eina_Bool @@ -93,13 +93,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->tgl, "elm,action,focus", "elm"); - evas_object_focus_set(wd->tgl, EINA_TRUE); + edje_object_signal_emit(wd->tgl, "elm,action,focus", "elm"); + evas_object_focus_set(wd->tgl, EINA_TRUE); } else { - edje_object_signal_emit(wd->tgl, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->tgl, EINA_FALSE); + edje_object_signal_emit(wd->tgl, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->tgl, EINA_FALSE); } } @@ -172,12 +172,12 @@ if (!wd) return; if (sub == wd->icon) { - edje_object_signal_emit(wd->tgl, "elm,state,icon,hidden", "elm"); - evas_object_event_callback_del_full - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - wd->icon = NULL; - edje_object_message_signal_process(wd->tgl); - _sizing_eval(obj); + edje_object_signal_emit(wd->tgl, "elm,state,icon,hidden", "elm"); + evas_object_event_callback_del_full + (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + wd->icon = NULL; + edje_object_message_signal_process(wd->tgl); + _sizing_eval(obj); } } @@ -218,7 +218,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "toggle"); elm_widget_type_set(obj, "toggle"); elm_widget_sub_object_add(parent, obj); @@ -318,12 +318,12 @@ wd->icon = icon; if (icon) { - elm_widget_sub_object_add(obj, icon); - evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->tgl, "elm.swallow.content", icon); - edje_object_signal_emit(wd->tgl, "elm,state,icon,visible", "elm"); - edje_object_message_signal_process(wd->tgl); + elm_widget_sub_object_add(obj, icon); + evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->tgl, "elm.swallow.content", icon); + edje_object_signal_emit(wd->tgl, "elm,state,icon,visible", "elm"); + edje_object_message_signal_process(wd->tgl); } _sizing_eval(obj); } @@ -431,12 +431,12 @@ if (!wd) return; if (state != wd->state) { - wd->state = state; - if (wd->statep) *wd->statep = wd->state; - if (wd->state) - edje_object_signal_emit(wd->tgl, "elm,state,toggle,on", "elm"); - else - edje_object_signal_emit(wd->tgl, "elm,state,toggle,off", "elm"); + wd->state = state; + if (wd->statep) *wd->statep = wd->state; + if (wd->state) + edje_object_signal_emit(wd->tgl, "elm,state,toggle,on", "elm"); + else + edje_object_signal_emit(wd->tgl, "elm,state,toggle,off", "elm"); } } @@ -473,15 +473,15 @@ if (!wd) return; if (statep) { - wd->statep = statep; - if (*wd->statep != wd->state) - { - wd->state = *wd->statep; - if (wd->state) - edje_object_signal_emit(wd->tgl, "elm,state,toggle,on", "elm"); - else - edje_object_signal_emit(wd->tgl, "elm,state,toggle,off", "elm"); - } + wd->statep = statep; + if (*wd->statep != wd->state) + { + wd->state = *wd->statep; + if (wd->state) + edje_object_signal_emit(wd->tgl, "elm,state,toggle,on", "elm"); + else + edje_object_signal_emit(wd->tgl, "elm,state,toggle,off", "elm"); + } } else wd->statep = NULL; Modified: trunk/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/elementary/src/lib/elm_toolbar.c 2011-04-01 11:08:31 UTC (rev 58248) +++ trunk/elementary/src/lib/elm_toolbar.c 2011-04-01 11:20:18 UTC (rev 58249) @@ -99,7 +99,7 @@ const char *icon_size = edje_object_data_get( elm_smart_scroller_edje_object_get(wd->scr), "icon_size"); if (icon_size) - return atoi(icon_size); + return atoi(icon_size); return _elm_config->icon_size; } @@ -178,19 +178,19 @@ { // avoid hide being emitted during object deletion evas_object_event_callback_del_full - (obj, EVAS_CALLBACK_HIDE, _menu_hide, data); + (obj, EVAS_CALLBACK_HIDE, _menu_hide, data); } static void _menu_move_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Elm_Toolbar_Item *it = data; - Evas_Coord x,y,w,h; - Widget_Data *wd = elm_widget_data_get(it->base.widget); + Elm_Toolbar_Item *it = data; + Evas_Coord x,y,w,h; + Widget_Data *wd = elm_widget_data_get(it->base.widget); - if ((!wd) || (!wd->menu_parent)) return; - evas_object_geometry_get(it->base.view, &x, &y, &w, &h); - elm_menu_move(it->o_menu, x, y+h); + if ((!wd) || (!wd->menu_parent)) return; + evas_object_geometry_get(it->base.view, &x, &y, &w, &h); + elm_menu_move(it->o_menu, x, y+h); } static void @@ -222,7 +222,7 @@ EINA_LIST_FREE(it->states, it_state) { if (it->icon == it_state->icon) - it->icon = NULL; + it->icon = NULL; eina_stringshare_del(it_state->label); eina_stringshare_del(it_state->icon_str); if (it_state->icon) evas_object_del(it_state->icon); @@ -251,7 +251,7 @@ it = next; } if (wd->more_item) - _item_del(wd->more_item); + _item_del(wd->more_item); } static void @@ -306,14 +306,14 @@ edje_object_part_text_set(view, "elm.text", it->label); } else - _elm_theme_object_set(obj, view, "toolbar", "separator", style); + _elm_theme_object_set(obj, view, "toolbar", "separator", style); mw = mh = -1; if (!it->separator) - elm_coords_finger_size_adjust(1, &mw, 1, &mh); + elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(view, &mw, &mh, mw, mh); if (!it->separator) - elm_coords_finger_size_adjust(1, &mw, 1, &mh); + elm_coords_finger_size_adjust(1, &mw, 1, &mh); evas_object_size_hint_min_set(view, mw, mh); } @@ -326,7 +326,7 @@ EINA_INLIST_FOREACH(wd->items, it) _mirrored_set_item(obj, it, mirrored); if (wd->more_item) - _mirrored_set_item(obj, wd->more_item, mirrored); + _mirrored_set_item(obj, wd->more_item, mirrored); } static void @@ -346,7 +346,7 @@ EINA_INLIST_FOREACH(wd->items, it) _theme_hook_item(obj, it, scale, wd->icon_size); if (wd->more_item) - _theme_hook_item(obj, wd->more_item, scale, wd->icon_size); + _theme_hook_item(obj, wd->more_item, scale, wd->icon_size); _sizing_eval(obj); } @@ -375,10 +375,10 @@ elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); switch (wd->shrink_mode) { - case ELM_TOOLBAR_SHRINK_MENU: /* fallthrough */ - case ELM_TOOLBAR_SHRINK_HIDE: /* fallthrough */ - case ELM_TOOLBAR_SHRINK_SCROLL: minw = w - vw; break; - case ELM_TOOLBAR_SHRINK_NONE: minw = minw_bx + (w - vw); break; + case ELM_TOOLBAR_SHRINK_MENU: /* fallthrough */ + case ELM_TOOLBAR_SHRINK_HIDE: /* fallthrough */ + case ELM_TOOLBAR_SHRINK_SCROLL: minw = w - vw; break; + case ELM_TOOLBAR_SHRINK_NONE: minw = minw_bx + (w - vw); break; } minh = minh + (h - vh); evas_object_size_hint_min_set(obj, minw, minh); @@ -473,7 +473,7 @@ _fix_items_visibility(wd, &iw, vw); evas_object_geometry_get(wd->more_item->base.view, NULL, NULL, &more_w, NULL); if (iw - more_w <= vw) - iw -= more_w; + iw -= more_w; /* All items are removed from the box object, since removing individual * items won't trigger a resize. Items are be readded below. */ @@ -488,7 +488,7 @@ EINA_INLIST_FOREACH(wd->items, it) { - if (!it->prio.visible) + if (!it->prio.visible) { if (it->separator) elm_menu_item_separator_add(menu, NULL); @@ -502,7 +502,7 @@ } evas_object_hide(it->base.view); } - else + else { evas_object_box_append(wd->bx, it->base.view); evas_object_show(it->base.view); @@ -535,13 +535,13 @@ { EINA_INLIST_FOREACH(wd->items, it) { - if (!it->prio.visible) - evas_object_hide(it->base.view); - else - { - evas_object_box_append(wd->bx, it->base.view); - evas_object_show(it->base.view); - } + if (!it->prio.visible) + evas_object_hide(it->base.view); + else + { + evas_object_box_append(wd->bx, it->base.view); + evas_object_show(it->base.view); + } } } else @@ -582,7 +582,7 @@ { Widget_Data *wd = elm_widget_data_get(data); if (!wd->resize_job) - wd->resize_job = ecore_job_add(_resize_job, data); + wd->resize_job = ecore_job_add(_resize_job, data); } static void @@ -657,9 +657,9 @@ edje_object_signal_callback_add(it->base.view, "elm,action,click", "elm", _select, it); edje_object_signal_callback_add(it->base.view, "elm,mouse,in", "elm", - _mouse_in, it); + _mouse_in, it); edje_object_signal_callback_add(it->base.view, "elm,mouse,out", "elm", - _mouse_out, it); + _mouse_out, it); elm_widget_sub_object_add(obj, it->base.view); if (it->icon) { @@ -702,7 +702,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "toolbar"); elm_widget_type_set(obj, "toolbar"); elm_widget_sub_object_add(parent, obj); @@ -722,8 +722,8 @@ EINA_FALSE); elm_widget_resize_object_set(obj, wd->scr); elm_smart_scroller_policy_set(wd->scr, - ELM_SMART_SCROLLER_POLICY_AUTO, - ELM_SMART_SCROLLER_POLICY_OFF); + ELM_SMART_SCROLLER_POLICY_AUTO, + ELM_SMART_SCROLLER_POLICY_OFF); wd->icon_size = _elm_toolbar_icon_size_get(wd); @@ -824,7 +824,7 @@ it_state = eina_list_data_get(it->current_state); if (it_state->func) - it_state->func((void *)it_state->data, obj, event_info); + it_state->func((void *)it_state->data, obj, event_info); } /** @@ -849,7 +849,7 @@ next_state = eina_list_next(item->current_state); if (!next_state) - next_state = eina_list_next(item->states); + next_state = eina_list_next(item->states); return eina_list_data_get(next_state); } @@ -875,7 +875,7 @@ prev_state = eina_list_prev(item->current_state); if ((!prev_state) || (prev_state == item->states)) - prev_state = eina_list_last(item->states); + prev_state = eina_list_last(item->states); return eina_list_data_get(prev_state); } @@ -926,7 +926,7 @@ if (!next_state) return EINA_FALSE; } else - next_state = it->states; + next_state = it->states; if (next_state == it->current_state) return EINA_TRUE; @@ -944,9 +944,9 @@ wd->icon_size, "elm,state,icon_set,backward"); } if (it->disabled) - elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm"); + elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm"); else - elm_widget_signal_emit(it->icon, "elm,state,enabled", "elm"); + elm_widget_signal_emit(it->icon, "elm,state,enabled", "elm"); it->current_state = next_state; return EINA_TRUE; @@ -1061,7 +1061,7 @@ del_state = eina_list_data_find_list(item->states, state); if (del_state == item->states) return EINA_FALSE; if (del_state == item->current_state) - elm_toolbar_item_state_unset(item); + elm_toolbar_item_state_unset(item); eina_stringshare_del(state->label); eina_stringshare_del(state->icon_str); @@ -1177,7 +1177,7 @@ if (!it) return NULL; wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it), - EINA_INLIST_GET(after)); + EINA_INLIST_GET(after)); evas_object_box_insert_after(wd->bx, it->base.view, after->base.view); evas_object_show(it->base.view); _sizing_eval(obj); @@ -1292,9 +1292,9 @@ elm_toolbar_item_priority_set(Elm_Toolbar_Item *item, int priority) { ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item); - if (item->prio.priority == priority) return; - item->prio.priority = priority; - _resize(item->base.widget, NULL, NULL, NULL); + if (item->prio.priority == priority) return; + item->prio.priority = priority; + _resize(item->base.widget, NULL, NULL, NULL); } /** @@ -1386,7 +1386,7 @@ _elm_toolbar_item_label_set_cb, item); } else - _elm_toolbar_item_label_update(item); + _elm_toolbar_item_label_update(item); _resize(item->base.widget, NULL, NULL, NULL); } @@ -1425,7 +1425,7 @@ EINA_LIST_FOREACH(item->states, l, it_state) if (it_state->icon == old_icon) - return; + return; evas_object_del(old_icon); } @@ -1509,7 +1509,7 @@ const char *s; if (icon_str) - eina_stringshare_replace(&item->icon_str, icon_str); + eina_stringshare_replace(&item->icon_str, icon_str); else { eina_stringshare_del(item->icon_str); @@ -1542,7 +1542,7 @@ _elm_toolbar_item_icon_set_cb, item); } else - _elm_toolbar_item_icon_update(item); + _elm_toolbar_item_icon_update(item); _resize(obj, NULL, NULL, NULL); } @@ -1576,8 +1576,8 @@ icon_obj = elm_icon_add(obj); if (!icon_obj) return; if (_item_icon_set(icon_obj, "toolbar/", icon)) - _elm_toolbar_item_icon_obj_set(obj, item, icon_obj, icon, wd->icon_size, - "elm,state,icon_set"); + _elm_toolbar_item_icon_obj_set(obj, item, icon_obj, icon, wd->icon_size, + "elm,state,icon_set"); else { _elm_toolbar_item_icon_obj_set(obj, item, NULL, NULL, 0, @@ -1722,7 +1722,7 @@ elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF, ELM_SMART_SCROLLER_POLICY_OFF); wd->more_item = _item_new(obj, "more_menu", "More", - NULL, NULL); + NULL, NULL); } else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE) elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF, @@ -1812,7 +1812,7 @@ elm_menu_parent_set(it->o_menu, wd->menu_parent); } if ((wd->more_item) && (wd->more_item->o_menu)) - elm_menu_parent_set(wd->more_item->o_menu, wd->menu_parent); + elm_menu_parent_set(wd->more_item->o_menu, wd->menu_parent); } /** @@ -2253,7 +2253,7 @@ EINA_INLIST_FOREACH(wd->items, it) elm_icon_order_lookup_set(it->icon, order); if (wd->more_item) - elm_icon_order_lookup_set(wd->more_item->icon, order); + elm_icon_order_lookup_set(wd->more_item->icon, order); } /** Modified: trunk/elementary/src/lib/elm_util.c =================================================================== --- trunk/elementary/src/lib/elm_util.c 2011-04-01 11:08:31 UTC (rev 58248) +++ trunk/elementary/src/lib/elm_util.c 2011-04-01 11:20:18 UTC (rev 58249) @@ -19,14 +19,14 @@ if (txt_len <= 0) return str; if ((*len + txt_len) >= *alloc) { - char *str2; - int alloc2; + char *str2; + int alloc2; - alloc2 = *alloc + txt_len + 128; - str2 = realloc(str, alloc2); - if (!str2) return str; - *alloc = alloc2; - str = str2; + alloc2 = *alloc + txt_len + 128; + str2 = realloc(str, alloc2); + if (!str2) return str; + *alloc = alloc2; + str = str2; } strcpy(str + *len, txt); *len += txt_len; @@ -47,114 +47,114 @@ s = p; for (;;) { - if ((!*p) || - (tag_end) || (esc_end) || - (tag_start) || (esc_start)) - { - if (tag_end) - { - char *ttag; + if ((!*p) || + (tag_end) || (esc_end) || + (tag_start) || (esc_start)) + { + if (tag_end) + { + char *ttag; - ttag = malloc(tag_end - tag_start); - if (ttag) - { - _str_ncpy(ttag, tag_start + 1, tag_end - tag_start - 1); - ttag[tag_end - tag_start - 1] = 0; - if (!strcmp(ttag, "br")) - str = _str_append(str, "\n", &str_len, &str_alloc); - else if (!strcmp(ttag, "\n")) - str = _str_append(str, "\n", &str_len, &str_alloc); - else if (!strcmp(ttag, "\\n")) - str = _str_append(str, "\n", &str_len, &str_alloc); - else if (!strcmp(ttag, "\t")) - str = _str_append(str, "\t", &str_len, &str_alloc); - else if (!strcmp(ttag, "\\t")) - str = _str_append(str, "\t", &str_len, &str_alloc); - else if (!strcmp(ttag, "ps")) /* Unicode paragraph separator */ - str = _str_append(str, "\xE2\x80\xA9", &str_len, &str_alloc); - free(ttag); - } - tag_start = tag_end = NULL; - } - else if (esc_end) - { - ts = malloc(esc_end - esc_start + 1); - if (ts) - { - const char *esc; - _str_ncpy(ts, esc_start, esc_end - esc_start); - ts[esc_end - esc_start] = 0; - esc = evas_textblock_escape_string_get(ts); - if (esc) - str = _str_append(str, esc, &str_len, &str_alloc); - free(ts); - } - esc_start = esc_end = NULL; - } - else if ((!*p) && (s)) - { - ts = malloc(p - s + 1); - if (ts) - { - _str_ncpy(ts, s, p - s); - ts[p - s] = 0; - str = _str_append(str, ts, &str_len, &str_alloc); - free(ts); - } + ttag = malloc(tag_end - tag_start); + if (ttag) + { + _str_ncpy(ttag, tag_start + 1, tag_end - tag_start - 1); + ttag[tag_end - tag_start - 1] = 0; + if (!strcmp(ttag, "br")) + str = _str_append(str, "\n", &str_len, &str_alloc); + else if (!strcmp(ttag, "\n")) + str = _str_append(str, "\n", &str_len, &str_alloc); + else if (!strcmp(ttag, "\\n")) + str = _str_append(str, "\n", &str_len, &str_alloc); + else if (!strcmp(ttag, "\t")) + str = _str_append(str, "\t", &str_len, &str_alloc); + else if (!strcmp(ttag, "\\t")) + str = _str_append(str, "\t", &str_len, &str_alloc); + else if (!strcmp(ttag, "ps")) /* Unicode paragraph separator */ + str = _str_append(str, "\xE2\x80\xA9", &str_len, &str_alloc); + free(ttag); + } + tag_start = tag_end = NULL; + } + else if (esc_end) + { + ts = malloc(esc_end - esc_start + 1); + if (ts) + { + const char *esc; + _str_ncpy(ts, esc_start, esc_end - esc_start); + ts[esc_end - esc_start] = 0; + esc = evas_textblock_escape_string_get(ts); + if (esc) + str = _str_append(str, esc, &str_len, &str_alloc); + free(ts); + } + esc_start = esc_end = NULL; + } + else if ((!*p) && (s)) + { + ts = malloc(p - s + 1); + if (ts) + { + _str_ncpy(ts, s, p - s); + ts[p - s] = 0; + str = _str_append(str, ts, &str_len, &str_alloc); + free(ts); + } break; - } - } - if (*p == '<') - { - if ((s) && (!esc_start)) - { - tag_start = p; - tag_end = NULL; - ts = malloc(p - s + 1); - if (ts) - { - _str_ncpy(ts, s, p - s); - ts[p - s] = 0; - str = _str_append(str, ts, &str_len, &str_alloc); - free(ts); - } - s = NULL; - } - } - else if (*p == '>') - { - if (tag_start) - { - tag_end = p; - s = p + 1; - } - } - else if (*p == '&') - { - if ((s) && (!tag_start)) - { - esc_start = p; - esc_end = NULL; - ts = malloc(p - s + 1); - if (ts) - { - _str_ncpy(ts, s, p - s); - ts[p - s] = 0; - str = _str_append(str, ts, &str_len, &str_alloc); - free(ts); - } - s = NULL; - } - } - else if (*p == ';') - { - if (esc_start) - { - esc_end = p; - s = p + 1; - } - } - p++; + } + } + if (*p == '<') + { + if ((s) && (!esc_start)) + { + tag_start = p; + tag_end = NULL; + ts = malloc(p - s + 1); + if (ts) + { + _str_ncpy(ts, s, p - s); + ts[p - s] = 0; + str = _str_append(str, ts, &str_len, &str_alloc); + free(ts); + } + s = NULL; + } + } + else if (*p == '>') + { + if (tag_start) + { + tag_end = p; + s = p + 1; + } + } + else if (*p == '&') + { + if ((s) && (!tag_start)) + { + esc_start = p; + esc_end = NULL; + ts = malloc(p - s + 1); + if (ts) + { + _str_ncpy(ts, s, p - s); + ts[p - s] = 0; + str = _str_append(str, ts, &str_len, &str_alloc); + free(ts); + } + s = NULL; + } + } + else if (*p == ';') + { + if (esc_start) + { + esc_end = p; + s = p + 1; + } + } + p++; } return str; } @@ -169,29 +169,29 @@ if (!text) return NULL; for (;;) { - pos = pos2; + pos = pos2; pos2 = evas_string_char_next_get((char *)(text), pos2, &ch); if ((ch <= 0) || (pos2 <= 0)) break; - if (ch == '\n') + if (ch == '\n') str = _str_append(str, "<br>", &str_len, &str_alloc); - else if (ch == '\t') + else if (ch == '\t') str = _str_append(str, "<\t>", &str_len, &str_alloc); - else if (ch == '<') + else if (ch == '<') str = _str_append(str, "<", &str_len, &str_alloc); - else if (ch == '>') + else if (ch == '>') str = _str_append(str, ">", &str_len, &str_alloc); - else if (ch == '&') + else if (ch == '&') str = _str_append(str, "&", &str_len, &str_alloc); else if (ch == 0x2029) /* PS */ str = _str_append(str, "<ps>", &str_len, &str_alloc); - else - { - char tstr[16]; + else + { + char tstr[16]; - _str_ncpy(tstr, text + pos, pos2 - pos); - tstr[pos2 - pos] = 0; - str = _str_append(str, tstr, &str_len, &str_alloc); - } + _str_ncpy(tstr, text + pos, pos2 - pos); + tstr[pos2 - pos] = 0; + str = _str_append(str, tstr, &str_len, &str_alloc); + } } return str; } Modified: trunk/elementary/src/lib/elm_widget.c =================================================================== --- trunk/elementary/src/lib/elm_widget.c 2011-04-01 11:08:31 UTC (rev 58248) +++ trunk/elementary/src/lib/elm_widget.c 2011-04-01 11:20:18 UTC (rev 58249) @@ -32,15 +32,15 @@ void (*theme_func) (Evas_Object *obj); Eina_Bool (*event_func) (Evas_Object *obj, Evas_Object *source, Evas_Callback_Type type, void *event_info); void (*signal_func) (Evas_Object *obj, const char *emission, - const char *source); + const char *source); void (*callback_add_func) (Evas_Object *obj, const char *emission, - const char *source, void (*func) (void *data, - Evas_Object *o, const char *emission, - const char *source), void *data); + const char *source, void (*func) (void *data, + Evas_Object *o, const char *emission, + const char *source), void *data); void (*callback_del_func) (Evas_Object *obj, const char *emission, - const char *source, void (*func) (void *data, - Evas_Object *o, const char *emission, - const char *source), void *data); + const char *source, void (*func) (void *data, + Evas_Object *o, const char *emission, + const char *source), void *data); void (*changed_func) (Evas_Object *obj); Eina_Bool (*focus_next_func) (const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next); @@ -200,30 +200,30 @@ _propagate_x_drag_lock(Evas_Object *obj, int dir) { INTERNAL_ENTRY - if (sd->parent_obj) - { - Smart_Data *sd2 = evas_object_smart_data_get(sd->parent_obj); - if (sd2) - { - sd2->child_drag_x_locked += dir; - _propagate_x_drag_lock(sd->parent_obj, dir); - } - } + if (sd->parent_obj) + { + Smart_Data *sd2 = evas_object_smart_data_get(sd->parent_obj); + if (sd2) + { + sd2->child_drag_x_locked += dir; + _propagate_x_drag_lock(sd->parent_obj, dir); + } + } } static void _propagate_y_drag_lock(Evas_Object *obj, int dir) { INTERNAL_ENTRY - if (sd->parent_obj) - { - Smart_Data *sd2 = evas_object_smart_data_get(sd->parent_obj); - if (sd2) - { - sd2->child_drag_y_locked += dir; - _propagate_y_drag_lock(sd->parent_obj, dir); - } - } + if (sd->parent_obj) + { + Smart_Data *sd2 = evas_object_smart_data_get(sd->parent_obj); + if (sd2) + { + sd2->child_drag_y_locked += dir; + _propagate_y_drag_lock(sd->parent_obj, dir); + } + } } static void @@ -235,26 +235,26 @@ switch (type) { - case EVAS_CALLBACK_KEY_DOWN: - { - Evas_Event_Key_Down *ev = event_info; - event_flags = &(ev->event_flags); - break; - } - case EVAS_CALLBACK_KEY_UP: - { - Evas_Event_Key_Up *ev = event_info; - event_flags = &(ev->event_flags); - break; - } - case EVAS_CALLBACK_MOUSE_WHEEL: - { - Evas_Event_Mouse_Wheel *ev = event_info; - event_flags = &(ev->event_flags); - break; - } - default: - break; + case EVAS_CALLBACK_KEY_DOWN: + { + Evas_Event_Key_Down *ev = event_info; + event_flags = &(ev->event_flags); + break; + } + case EVAS_CALLBACK_KEY_UP: + { + Evas_Event_Key_Up *ev = event_info; + event_flags = &(ev->event_flags); + break; + } + case EVAS_CALLBACK_MOUSE_WHEEL: + { + Evas_Event_Mouse_Wheel *ev = event_info; + event_flags = &(ev->event_flags); + break; + } + default: + break; } elm_widget_event_propagate(obj, type, event_info, event_flags); @@ -271,21 +271,21 @@ if (sd->focused) return; if (o) { - unsigned int i = 0; - Evas_Object *ret; + unsigned int i = 0; + Evas_Object *ret; - ret = _newest_focus_order_get(o, &i, EINA_TRUE); + ret = _newest_focus_order_get(o, &i, EINA_TRUE); - /* we don't want to bump a common widget ancestor's - focus_order *twice* while parent focusing */ - if (!ret || (!i) || (i != focus_order)) - _parent_focus(o); + /* we don't want to bump a common widget ancestor's + focus_order *twice* while parent focusing */ + if (!ret || (!i) || (i != focus_order)) + _parent_focus(o); } if (!sd->focus_order_on_calc) return; /* we don't want to override it if by means of any of the - callbacks below one gets to calculate our order - first. */ + callbacks below one gets to calculate our order + first. */ focus_order++; sd->focus_order = focus_order; @@ -511,7 +511,7 @@ } if (!force) return; EINA_LIST_FOREACH(sd->subobjs, l, child) - elm_widget_theme_specific(child, th, force); + elm_widget_theme_specific(child, th, force); if (sd->resize_obj) elm_widget_theme(sd->resize_obj); if (sd->hover_obj) elm_widget_theme(sd->hover_obj); EINA_LIST_FOREACH(sd->tooltips, l, tt) elm_tooltip_theme(tt); @@ -562,8 +562,8 @@ API_ENTRY return; if (sd->is_mirrored != mirrored) { - sd->is_mirrored = mirrored; - elm_widget_theme(obj); + sd->is_mirrored = mirrored; + elm_widget_theme(obj); } } @@ -582,7 +582,7 @@ Eina_Bool mirrored = elm_mirrored_get(); if (elm_widget_mirrored_automatic_get(obj) && (sd->is_mirrored != mirrored)) { - sd->is_mirrored = mirrored; + sd->is_mirrored = mirrored; } } @@ -613,7 +613,7 @@ API_ENTRY return; if (sd->mirrored_auto_mode != automatic) { - sd->mirrored_auto_mode = automatic; + sd->mirrored_auto_mode = automatic; if (automatic) { @@ -739,7 +739,7 @@ sd->subobjs = eina_list_append(sd->subobjs, sobj); evas_object_data_set(sobj, "elm-parent", obj); - evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd); + evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd); if (_elm_widget_is(sobj)) evas_object_event_callback_add(sobj, EVAS_CALLBACK_HIDE, _sub_obj_hide, sd); evas_object_smart_callback_call(obj, "sub-object-add", sobj); @@ -760,20 +760,20 @@ sobj_parent = evas_object_data_del(sobj, "elm-parent"); if (sobj_parent != obj) { - static int abort_on_warn = -1; - ERR("removing sub obje... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2011-04-01 11:24:24
|
Log: elementary / slider, radio, separator, photocam, photo, store, scroller, slideshow, spinner, progressbar - removed white spacesw Author: hermet Date: 2011-04-01 04:24:15 -0700 (Fri, 01 Apr 2011) New Revision: 58250 Trac: http://trac.enlightenment.org/e/changeset/58250 Modified: trunk/elementary/src/lib/elm_photo.c trunk/elementary/src/lib/elm_photocam.c trunk/elementary/src/lib/elm_progressbar.c trunk/elementary/src/lib/elm_radio.c trunk/elementary/src/lib/elm_scroller.c trunk/elementary/src/lib/elm_separator.c trunk/elementary/src/lib/elm_slider.c trunk/elementary/src/lib/elm_slideshow.c trunk/elementary/src/lib/elm_spinner.c trunk/elementary/src/lib/elm_store.c Modified: trunk/elementary/src/lib/elm_photo.c =================================================================== --- trunk/elementary/src/lib/elm_photo.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_photo.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -5,8 +5,8 @@ * @defgroup Photo Photo * * For displaying the photo of a person (contact). Simple yet - * with a very specific purpose. - * + * with a very specific purpose. + * * Signals that you can add callbacks for are: * * - clicked: This is called when a user has clicked the photo @@ -57,10 +57,10 @@ if (!wd) return; _elm_widget_mirrored_reload(obj); _mirrored_set(wd->frm, elm_widget_mirrored_get(obj)); - _elm_theme_object_set(obj, wd->frm, "photo", "base", + _elm_theme_object_set(obj, wd->frm, "photo", "base", elm_widget_style_get(obj)); edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->img); - edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * + edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * _elm_config->scale); _sizing_eval(obj); } @@ -72,7 +72,7 @@ Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; if (!wd) return; - if (wd->size > 0) + if (wd->size > 0) { double scale = 0.0; @@ -96,7 +96,7 @@ Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; - if (wd->fill) + if (wd->fill) { Edje_Message_Int_Set *msg; Evas_Object *icon = _els_smart_icon_object_get(wd->img); @@ -218,7 +218,7 @@ Evas_Object *icon; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "photo"); elm_widget_type_set(obj, "photo"); elm_widget_sub_object_add(parent, obj); @@ -238,12 +238,12 @@ _els_smart_icon_fill_inside_set(wd->img, 0); _els_smart_icon_scale_size_set(wd->img, 0); wd->fill = EINA_FALSE; - _els_smart_icon_scale_set(wd->img, + _els_smart_icon_scale_set(wd->img, elm_widget_scale_get(obj) * _elm_config->scale); evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_UP, - _mouse_up, obj); + _mouse_up, obj); evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_DOWN, - _mouse_down, obj); + _mouse_down, obj); evas_object_repeat_events_set(wd->img, 1); edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->img); evas_object_show(wd->img); @@ -253,9 +253,9 @@ icon = _els_smart_icon_object_get(wd->img); evas_object_event_callback_add(icon, EVAS_CALLBACK_MOVE, - _icon_move_resize, obj); + _icon_move_resize, obj); evas_object_event_callback_add(icon, EVAS_CALLBACK_RESIZE, - _icon_move_resize, obj); + _icon_move_resize, obj); _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); Modified: trunk/elementary/src/lib/elm_photocam.c =================================================================== --- trunk/elementary/src/lib/elm_photocam.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_photocam.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -9,35 +9,35 @@ * and zooming and panning as well as fitting logic. It is entirely focused * on jpeg images, and takes advantage of properties of the jpeg format (via * evas loader features in the jpeg loader). - * + * * Signals that you can add callbacks for are: * * clicked - This is called when a user has clicked the photo without dragging * around. - * + * * press - This is called when a user has pressed down on the photo. - * + * * longpressed - This is called when a user has pressed down on the photo for * a long time without dragging around. - * + * * clicked,double - This is called when a user has double-clicked the photo. - * + * * load - Photo load begins. - * + * * loaded - This is called when the image file load is complete for the first * view (low resolution blurry version). * * load,details - Photo detailed data load begins. - * + * * loaded,details - This is called when the image file load is complete for the * detailed image data (full resolution needed). * * zoom,start - Zoom animation started. - * + * * zoom,stop - Zoom animation stopped. - * + * * zoom,change - Zoom changed when using an auto zoom mode. - * + * * scroll - the content has been scrolled (moved) * * scroll,anim,start - scrolling animation has started @@ -47,11 +47,11 @@ * scroll,drag,start - dragging the contents around has started * * scroll,drag,stop - dragging the contents around has stopped - * + * * --- - * + * * TODO (maybe - optional future stuff): - * + * * 1. wrap photo in theme edje so u can have styling around photo (like white * photo bordering). * 2. exif handling @@ -67,7 +67,7 @@ { Widget_Data *wd; Evas_Object *img; - struct + struct { int x, y, w, h; } src, out; @@ -97,26 +97,26 @@ double zoom; Elm_Photocam_Zoom_Mode mode; const char *file; - + Ecore_Job *calc_job; Ecore_Timer *scr_timer; Ecore_Timer *long_timer; Ecore_Animator *zoom_animator; double t_start, t_end; - struct + struct { int imw, imh; int w, h; int ow, oh, nw, nh; - struct + struct { double x, y; } spos; } size; struct { - Eina_Bool show : 1; - Evas_Coord x, y ,w ,h; + Eina_Bool show : 1; + Evas_Coord x, y ,w ,h; } show; int tsize; Evas_Object *img; // low res version of image (scale down == 8) @@ -179,8 +179,8 @@ if (wd->show.show) { - wd->show.show = EINA_FALSE; - elm_smart_scroller_child_region_show(wd->scr, wd->show.x, wd->show.y, wd->show.w, wd->show.h); + wd->show.show = EINA_FALSE; + elm_smart_scroller_child_region_show(wd->scr, wd->show.x, wd->show.y, wd->show.w, wd->show.h); } } @@ -202,7 +202,7 @@ for (x = 0; x < g->gw; x++) { int tn, xx, yy, ww, hh; - + tn = (y * g->gw) + x; xx = g->grid[tn].out.x; yy = g->grid[tn].out.y; @@ -240,7 +240,7 @@ for (x = 0; x < g->gw; x++) { int tn; - + tn = (y * g->gw) + x; evas_object_del(g->grid[tn].img); if (g->grid[tn].want) @@ -295,15 +295,15 @@ Widget_Data *wd = elm_widget_data_get(obj); int x, y; Grid *g; - + if (!wd) return NULL; g = calloc(1, sizeof(Grid)); - + g->zoom = grid_zoom_calc(wd->zoom); g->tsize = wd->tsize; g->iw = wd->size.imw; g->ih = wd->size.imh; - + g->w = g->iw / g->zoom; g->h = g->ih / g->zoom; if (g->zoom >= 8) return NULL; @@ -321,7 +321,7 @@ for (x = 0; x < g->gw; x++) { int tn; - + tn = (y * g->gw) + x; g->grid[tn].src.x = x * g->tsize; if (x == (g->gw - 1)) @@ -333,25 +333,25 @@ g->grid[tn].src.h = g->h - ((g->gh - 1) * g->tsize); else g->grid[tn].src.h = g->tsize; - + g->grid[tn].out.x = g->grid[tn].src.x; g->grid[tn].out.y = g->grid[tn].src.y; g->grid[tn].out.w = g->grid[tn].src.w; g->grid[tn].out.h = g->grid[tn].src.h; - + g->grid[tn].wd = wd; - g->grid[tn].img = - evas_object_image_add(evas_object_evas_get(obj)); + g->grid[tn].img = + evas_object_image_add(evas_object_evas_get(obj)); evas_object_image_scale_hint_set - (g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC); + (g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC); evas_object_pass_events_set(g->grid[tn].img, EINA_TRUE); - evas_object_smart_member_add(g->grid[tn].img, + evas_object_smart_member_add(g->grid[tn].img, wd->pan_smart); elm_widget_sub_object_add(obj, g->grid[tn].img); evas_object_image_filled_set(g->grid[tn].img, 1); - evas_object_event_callback_add(g->grid[tn].img, + evas_object_event_callback_add(g->grid[tn].img, EVAS_CALLBACK_IMAGE_PRELOADED, - _tile_preloaded, + _tile_preloaded, &(g->grid[tn])); } } @@ -375,7 +375,7 @@ { int tn, xx, yy, ww, hh; Eina_Bool visible = EINA_FALSE; - + tn = (y * g->gw) + x; xx = g->grid[tn].out.x; yy = g->grid[tn].out.y; @@ -393,7 +393,7 @@ yy = (gh * yy) / g->h; hh = ((gh * (ty + hh)) / g->h) - yy; } - if (ELM_RECTS_INTERSECT(xx - wd->pan_x + ox, + if (ELM_RECTS_INTERSECT(xx - wd->pan_x + ox, yy - wd->pan_y + oy, ww, hh, cvx, cvy, cvw, cvh)) @@ -409,7 +409,7 @@ g->grid[tn].src.y, g->grid[tn].src.w, g->grid[tn].src.h); - evas_object_image_file_set(g->grid[tn].img, wd->file, NULL); + evas_object_image_file_set(g->grid[tn].img, wd->file, NULL); evas_object_image_preload(g->grid[tn].img, 0); wd->preload_num++; if (wd->preload_num == 1) @@ -472,7 +472,7 @@ for (x = 0; x < g->gw; x++) { int tn; - + tn = (y * g->gw) + x; evas_object_image_smooth_scale_set(g->grid[tn].img, (!wd->nosmooth)); } @@ -485,13 +485,13 @@ _grid_raise(Grid *g) { int x, y; - + for (y = 0; y < g->gh; y++) { for (x = 0; x < g->gw; x++) { int tn; - + tn = (y * g->gw) + x; evas_object_raise(g->grid[tn].img); } @@ -578,7 +578,7 @@ { Eina_List *l, *l_next; Grid *g; - + EINA_LIST_FOREACH_SAFE(wd->grids, l, l_next, g) { if (g->dead) @@ -626,7 +626,7 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); -// Evas_Event_Mouse_Move *ev = event_info; + // Evas_Event_Mouse_Move *ev = event_info; if (!wd) return; } @@ -658,7 +658,7 @@ if (wd->long_timer) ecore_timer_del(wd->long_timer); wd->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data); } - + static void _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { @@ -677,7 +677,7 @@ evas_object_smart_callback_call(data, "clicked", NULL); wd->on_hold = EINA_FALSE; } - + static Evas_Smart_Class _pan_sc = EVAS_SMART_CLASS_INIT_NULL; static void @@ -708,13 +708,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->obj, "elm,action,focus", "elm"); - evas_object_focus_set(wd->obj, EINA_TRUE); + edje_object_signal_emit(wd->obj, "elm,action,focus", "elm"); + evas_object_focus_set(wd->obj, EINA_TRUE); } else { - edje_object_signal_emit(wd->obj, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->obj, EINA_FALSE); + edje_object_signal_emit(wd->obj, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->obj, EINA_FALSE); } } @@ -724,21 +724,21 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; elm_smart_scroller_object_theme_set(obj, wd->scr, "photocam", "base", elm_widget_style_get(obj)); -// 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); _sizing_eval(obj); } /* -static void -_show_region_hook(void *data, Evas_Object *obj) -{ + static void + _show_region_hook(void *data, Evas_Object *obj) + { Widget_Data *wd = elm_widget_data_get(data); Evas_Coord x, y, w, h; if (!wd) return; elm_widget_show_region_get(obj, &x, &y, &w, &h); elm_smart_scroller_child_region_show(wd->scr, x, y, w, h); -} -*/ + } + */ static void _sizing_eval(Evas_Object *obj) @@ -746,11 +746,11 @@ Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; if (!wd) return; -// evas_object_size_hint_min_get(wd->scr, &minw, &minh); + // evas_object_size_hint_min_get(wd->scr, &minw, &minh); evas_object_size_hint_max_get(wd->scr, &maxw, &maxh); -// minw = -1; -// minh = -1; -// if (wd->mode != ELM_LIST_LIMIT) minw = -1; + // minw = -1; + // minh = -1; + // if (wd->mode != ELM_LIST_LIMIT) minw = -1; evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, maxw, maxh); } @@ -959,9 +959,9 @@ evas_object_smart_callback_call(data, "scroll", NULL); } -static Eina_Bool +static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, - Evas_Callback_Type type, void *event_info) + Evas_Callback_Type type, void *event_info) { double zoom; if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; @@ -984,41 +984,41 @@ elm_smart_scroller_page_size_get(wd->scr, &page_x, &page_y); elm_smart_scroller_child_viewport_size_get(wd->scr, &v_w, &v_h); - if ((!strcmp(ev->keyname, "Left")) || + if ((!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left"))) { x -= step_x; } - else if ((!strcmp(ev->keyname, "Right")) || + else if ((!strcmp(ev->keyname, "Right")) || (!strcmp(ev->keyname, "KP_Right"))) { x += step_x; } - else if ((!strcmp(ev->keyname, "Up")) || + else if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up"))) { y -= step_y; } - else if ((!strcmp(ev->keyname, "Down")) || + else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down"))) { y += step_y; } - else if ((!strcmp(ev->keyname, "Prior")) || + else if ((!strcmp(ev->keyname, "Prior")) || (!strcmp(ev->keyname, "KP_Prior"))) { if (page_y < 0) - y -= -(page_y * v_h) / 100; + y -= -(page_y * v_h) / 100; else - y -= page_y; + y -= page_y; } - else if ((!strcmp(ev->keyname, "Next")) || + else if ((!strcmp(ev->keyname, "Next")) || (!strcmp(ev->keyname, "KP_Next"))) { if (page_y < 0) - y += -(page_y * v_h) / 100; + y += -(page_y * v_h) / 100; else - y += page_y; + y += page_y; } else if ((!strcmp(ev->keyname, "KP_Add"))) { @@ -1027,7 +1027,7 @@ elm_photocam_zoom_mode_set(obj, ELM_PHOTOCAM_ZOOM_MODE_MANUAL); elm_photocam_zoom_set(obj, zoom); return EINA_TRUE; - } + } else if ((!strcmp(ev->keyname, "KP_Subtract"))) { zoom = elm_photocam_zoom_get(obj); @@ -1063,7 +1063,7 @@ Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "photocam"); elm_widget_type_set(obj, "photocam"); elm_widget_sub_object_add(parent, obj); @@ -1086,7 +1086,7 @@ evas_object_smart_callback_add(wd->scr, "drag,start", _scr_drag_start, obj); evas_object_smart_callback_add(wd->scr, "drag,stop", _scr_drag_stop, obj); evas_object_smart_callback_add(wd->scr, "scroll", _scr_scroll, obj); - + elm_smart_scroller_bounce_allow_set(wd->scr, bounce, bounce); wd->obj = obj; @@ -1095,38 +1095,38 @@ evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, obj); evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, obj); evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, obj); - + if (!smart) { - static Evas_Smart_Class sc; + static Evas_Smart_Class sc; - evas_object_smart_clipped_smart_set(&_pan_sc); - sc = _pan_sc; - sc.name = "elm_photocam_pan"; - sc.version = EVAS_SMART_CLASS_VERSION; - sc.add = _pan_add; - sc.del = _pan_del; - sc.resize = _pan_resize; - sc.move = _pan_move; - sc.calculate = _pan_calculate; - smart = evas_smart_class_new(&sc); + evas_object_smart_clipped_smart_set(&_pan_sc); + sc = _pan_sc; + sc.name = "elm_photocam_pan"; + sc.version = EVAS_SMART_CLASS_VERSION; + sc.add = _pan_add; + sc.del = _pan_del; + sc.resize = _pan_resize; + sc.move = _pan_move; + sc.calculate = _pan_calculate; + smart = evas_smart_class_new(&sc); } if (smart) { - wd->pan_smart = evas_object_smart_add(e, smart); - wd->pan = evas_object_smart_data_get(wd->pan_smart); - wd->pan->wd = wd; + wd->pan_smart = evas_object_smart_add(e, smart); + wd->pan = evas_object_smart_data_get(wd->pan_smart); + wd->pan->wd = wd; } elm_smart_scroller_extern_pan_set(wd->scr, wd->pan_smart, - _pan_set, _pan_get, _pan_max_get, + _pan_set, _pan_get, _pan_max_get, _pan_min_get, _pan_child_size_get); wd->zoom = 1; wd->mode = ELM_PHOTOCAM_ZOOM_MODE_MANUAL; - + wd->tsize = 512; - + wd->img = evas_object_image_add(e); evas_object_image_scale_hint_set(wd->img, EVAS_IMAGE_SCALE_HINT_DYNAMIC); evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_DOWN, @@ -1141,8 +1141,8 @@ evas_object_image_filled_set(wd->img, 1); evas_object_event_callback_add(wd->img, EVAS_CALLBACK_IMAGE_PRELOADED, _main_preloaded, obj); - - edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), + + edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh); evas_object_size_hint_min_set(obj, minw, minh); @@ -1175,7 +1175,7 @@ if (!wd) return EVAS_LOAD_ERROR_GENERIC; if (!eina_stringshare_replace(&wd->file, file)) return EVAS_LOAD_ERROR_NONE; grid_clearall(obj); - + evas_object_hide(wd->img); evas_object_image_smooth_scale_set(wd->img, (wd->nosmooth == 0)); evas_object_image_file_set(wd->img, NULL, NULL); @@ -1220,7 +1220,7 @@ * Returns the path of the current image file * * @param obj The photocam object - * @return Returns the path + * @return Returns the path * * @ingroup Photocam */ @@ -1240,7 +1240,7 @@ * (that is 2x2 photo pixels will display as 1 on-screen pixel). 4:1 will be * 4x4 photo pixels as 1 screen pixel, and so on. The @p zoom parameter must * be greater than 0. It is usggested to stick to powers of 2. (1, 2, 4, 8, - * 16, 32, etc.). + * 16, 32, etc.). * * @param obj The photocam object * @param zoom The zoom level to set @@ -1379,7 +1379,7 @@ free(g); } } - done: +done: wd->t_start = ecore_loop_time_get(); wd->t_end = wd->t_start + _elm_config->zoom_friction; if ((wd->size.w > 0) && (wd->size.h > 0)) @@ -1531,9 +1531,9 @@ /** * Get the current area of the image that is currently shown - * - * This gets the region - * + * + * This gets the region + * */ EAPI void elm_photocam_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h) @@ -1561,8 +1561,8 @@ } else { - if (x) *x = 0; - if (w) *w = 0; + if (x) *x = 0; + if (w) *w = 0; } if (wd->size.h > 0) @@ -1582,8 +1582,8 @@ } else { - if (y) *y = 0; - if (h) *h = 0; + if (y) *y = 0; + if (h) *h = 0; } } @@ -1614,7 +1614,7 @@ rh = (w * wd->size.h) / wd->size.imh; if (rw < 1) rw = 1; if (rh < 1) rh = 1; - if ((rx + rw) > wd->size.w) rx = wd->size.w - rw; + if ((rx + rw) > wd->size.w) rx = wd->size.w - rw; if ((ry + rh) > wd->size.h) ry = wd->size.h - rh; if (wd->zoom_animator) { @@ -1654,7 +1654,7 @@ rh = (w * wd->size.h) / wd->size.imh; if (rw < 1) rw = 1; if (rh < 1) rh = 1; - if ((rx + rw) > wd->size.w) rx = wd->size.w - rw; + if ((rx + rw) > wd->size.w) rx = wd->size.w - rw; if ((ry + rh) > wd->size.h) ry = wd->size.h - rh; if (wd->zoom_animator) { @@ -1664,17 +1664,17 @@ wd->zoom_animator = NULL; zoom_do(obj, 1.0); evas_object_smart_callback_call(obj, "zoom,stop", NULL); - } + } elm_smart_scroller_region_bring_in(wd->scr, rx, ry, rw, rh); } /** * Set the paused state for photocam - * + * * This sets the paused state to on (1) or off (0) for photocam. The default * is on. This will stop zooming using animation ch change zoom levels and * change instantly. This will stop any existing animations that are running. - * + * * @param obj The photocam object * @param paused The pause state to set * @@ -1702,9 +1702,9 @@ /** * Get the paused state for photocam - * + * * This gets the current paused state for the photocam object. - * + * * @param obj The photocam object * @return The current paused state * @@ -1721,7 +1721,7 @@ /** * Get the internal low-res image used for photocam - * + * * This gets the internal image object inside photocam. Do not modify it. It * is for inspection only, and hooking callbacks to. Nothing else. It may be * deleted at any time as well. Modified: trunk/elementary/src/lib/elm_progressbar.c =================================================================== --- trunk/elementary/src/lib/elm_progressbar.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_progressbar.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -82,11 +82,11 @@ _elm_theme_object_set(obj, wd->progressbar, "progressbar", "horizontal", elm_widget_style_get(obj)); else _elm_theme_object_set(obj, wd->progressbar, "progressbar", "vertical", elm_widget_style_get(obj)); - + if (wd->icon) { - edje_object_part_swallow(wd->progressbar, "elm.swallow.content", wd->icon); - edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm"); + edje_object_part_swallow(wd->progressbar, "elm.swallow.content", wd->icon); + edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm"); } if (wd->label) { @@ -94,15 +94,15 @@ edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm"); } if (wd->pulse) - edje_object_signal_emit(wd->progressbar, "elm,state,pulse", "elm"); + edje_object_signal_emit(wd->progressbar, "elm,state,pulse", "elm"); else - edje_object_signal_emit(wd->progressbar, "elm,state,fraction", "elm"); + edje_object_signal_emit(wd->progressbar, "elm,state,fraction", "elm"); if (wd->pulse_state) - edje_object_signal_emit(wd->progressbar, "elm,state,pulse,start", "elm"); - + edje_object_signal_emit(wd->progressbar, "elm,state,pulse,start", "elm"); + if ((wd->units) && (!wd->pulse)) - edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm"); - + edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm"); + if (wd->horizontal) evas_object_size_hint_min_set(wd->spacer, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale, 1); else @@ -111,8 +111,8 @@ edje_object_part_swallow(wd->progressbar, "elm.swallow.bar", wd->spacer); if (wd->inverted) - edje_object_signal_emit(wd->progressbar, "elm,state,inverted,on", "elm"); - + edje_object_signal_emit(wd->progressbar, "elm,state,inverted,on", "elm"); + _units_set(obj); edje_object_message_signal_process(wd->progressbar); edje_object_scale_set(wd->progressbar, elm_widget_scale_get(obj) * _elm_config->scale); @@ -148,12 +148,12 @@ if (!wd) return; if (sub == wd->icon) { - edje_object_signal_emit(wd->progressbar, "elm,state,icon,hidden", "elm"); - evas_object_event_callback_del_full - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - wd->icon = NULL; - edje_object_message_signal_process(wd->progressbar); - _sizing_eval(obj); + edje_object_signal_emit(wd->progressbar, "elm,state,icon,hidden", "elm"); + evas_object_event_callback_del_full + (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + wd->icon = NULL; + edje_object_message_signal_process(wd->progressbar); + _sizing_eval(obj); } } @@ -167,8 +167,8 @@ pos = wd->val; rtl = elm_widget_mirrored_get(obj); if ((!rtl && wd->inverted) || (rtl && - ((!wd->horizontal && wd->inverted) || - (wd->horizontal && !wd->inverted)))) pos = MAX_RATIO_LVL - pos; + ((!wd->horizontal && wd->inverted) || + (wd->horizontal && !wd->inverted)))) pos = MAX_RATIO_LVL - pos; edje_object_part_drag_value_set(wd->progressbar, "elm.cur.progressbar", pos, pos); } @@ -203,7 +203,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "progressbar"); elm_widget_type_set(obj, "progressbar"); elm_widget_sub_object_add(parent, obj); @@ -359,13 +359,13 @@ eina_stringshare_replace(&wd->label, label); if (label) { - edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->progressbar); + edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm"); + edje_object_message_signal_process(wd->progressbar); } else { - edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->progressbar); + edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->progressbar); } edje_object_part_text_set(wd->progressbar, "elm.text", label); _sizing_eval(obj); @@ -411,12 +411,12 @@ wd->icon = icon; if (icon) { - elm_widget_sub_object_add(obj, icon); - evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->progressbar, "elm.swallow.content", icon); - edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm"); - edje_object_message_signal_process(wd->progressbar); + elm_widget_sub_object_add(obj, icon); + evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->progressbar, "elm.swallow.content", icon); + edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm"); + edje_object_message_signal_process(wd->progressbar); } _sizing_eval(obj); } @@ -530,13 +530,13 @@ eina_stringshare_replace(&wd->units, units); if (units) { - edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm"); - edje_object_message_signal_process(wd->progressbar); + edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm"); + edje_object_message_signal_process(wd->progressbar); } else { - edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm"); - edje_object_message_signal_process(wd->progressbar); + edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm"); + edje_object_message_signal_process(wd->progressbar); } _units_set(obj); _sizing_eval(obj); Modified: trunk/elementary/src/lib/elm_radio.c =================================================================== --- trunk/elementary/src/lib/elm_radio.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_radio.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -108,13 +108,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->radio, "elm,action,focus", "elm"); - evas_object_focus_set(wd->radio, EINA_TRUE); + edje_object_signal_emit(wd->radio, "elm,action,focus", "elm"); + evas_object_focus_set(wd->radio, EINA_TRUE); } else { - edje_object_signal_emit(wd->radio, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->radio, EINA_FALSE); + edje_object_signal_emit(wd->radio, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->radio, EINA_FALSE); } } @@ -201,11 +201,11 @@ if (!wd) return; if (sub == wd->icon) { - edje_object_signal_emit(wd->radio, "elm,state,icon,hidden", "elm"); - evas_object_event_callback_del_full - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - wd->icon = NULL; - _sizing_eval(obj); + edje_object_signal_emit(wd->radio, "elm,state,icon,hidden", "elm"); + evas_object_event_callback_del_full + (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + wd->icon = NULL; + _sizing_eval(obj); } } @@ -216,11 +216,11 @@ if (!wd) return; if ((state != wd->state) && (!elm_widget_disabled_get(obj))) { - wd->state = state; - if (wd->state) - edje_object_signal_emit(wd->radio, "elm,state,radio,on", "elm"); - else - edje_object_signal_emit(wd->radio, "elm,state,radio,off", "elm"); + wd->state = state; + if (wd->state) + edje_object_signal_emit(wd->radio, "elm,state,radio,on", "elm"); + else + edje_object_signal_emit(wd->radio, "elm,state,radio,off", "elm"); } } @@ -232,14 +232,14 @@ Eina_Bool disabled = EINA_FALSE; EINA_LIST_FOREACH(wd->group->radios, l, child) { - Widget_Data *wd2 = elm_widget_data_get(child); + Widget_Data *wd2 = elm_widget_data_get(child); if (wd2->state) selected = child; - if (wd2->value == wd->group->value) + if (wd2->value == wd->group->value) { _state_set(child, 1); if (!wd2->state) disabled = EINA_TRUE; } - else _state_set(child, 0); + else _state_set(child, 0); } if ((disabled) && (selected)) _state_set(selected, 1); } @@ -269,13 +269,13 @@ } /** - * Add a new radio to the parent - * - * @param parent The parent object - * @return The new object or NULL if it cannot be created - * - * @ingroup Radio - */ + * Add a new radio to the parent + * + * @param parent The parent object + * @return The new object or NULL if it cannot be created + * + * @ingroup Radio + */ EAPI Evas_Object * elm_radio_add(Evas_Object *parent) { @@ -284,7 +284,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "radio"); elm_widget_type_set(obj, "radio"); elm_widget_sub_object_add(parent, obj); @@ -335,13 +335,13 @@ eina_stringshare_replace(&wd->label, label); if (label) { - edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->radio); + edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm"); + edje_object_message_signal_process(wd->radio); } else { - edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->radio); + edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->radio); } edje_object_part_text_set(wd->radio, "elm.text", label); _sizing_eval(obj); @@ -387,12 +387,12 @@ wd->icon = icon; if (icon) { - elm_widget_sub_object_add(obj, icon); - evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->radio, "elm.swallow.content", icon); - edje_object_signal_emit(wd->radio, "elm,state,icon,visible", "elm"); - edje_object_message_signal_process(wd->radio); + elm_widget_sub_object_add(obj, icon); + evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->radio, "elm.swallow.content", icon); + edje_object_signal_emit(wd->radio, "elm,state,icon,visible", "elm"); + edje_object_message_signal_process(wd->radio); } _sizing_eval(obj); } @@ -460,19 +460,19 @@ if (!wd) return; if (!wd2) { - if (eina_list_count(wd->group->radios) == 1) - return; - wd->group->radios = eina_list_remove(wd->group->radios, obj); - wd->group = calloc(1, sizeof(Group)); - wd->group->radios = eina_list_append(wd->group->radios, obj); + if (eina_list_count(wd->group->radios) == 1) + return; + wd->group->radios = eina_list_remove(wd->group->radios, obj); + wd->group = calloc(1, sizeof(Group)); + wd->group->radios = eina_list_append(wd->group->radios, obj); } else if (wd->group == wd2->group) return; else { - wd->group->radios = eina_list_remove(wd->group->radios, obj); - if (!wd->group->radios) free(wd->group); - wd->group = wd2->group; - wd->group->radios = eina_list_append(wd->group->radios, obj); + wd->group->radios = eina_list_remove(wd->group->radios, obj); + if (!wd->group->radios) free(wd->group); + wd->group = wd2->group; + wd->group->radios = eina_list_append(wd->group->radios, obj); } if (wd->value == wd->group->value) _state_set(obj, 1); else _state_set(obj, 0); @@ -581,15 +581,15 @@ if (!wd) return; if (valuep) { - wd->group->valuep = valuep; - if (*(wd->group->valuep) != wd->group->value) - { - wd->group->value = *(wd->group->valuep); - _state_set_all(wd); - } + wd->group->valuep = valuep; + if (*(wd->group->valuep) != wd->group->value) + { + wd->group->value = *(wd->group->valuep); + _state_set_all(wd); + } } else { - wd->group->valuep = NULL; + wd->group->valuep = NULL; } } Modified: trunk/elementary/src/lib/elm_scroller.c =================================================================== --- trunk/elementary/src/lib/elm_scroller.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_scroller.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -129,17 +129,17 @@ } else if ((!strcmp(ev->keyname, "Prior")) || (!strcmp(ev->keyname, "KP_Prior"))) { - if (page_y < 0) - y -= -(page_y * v_h) / 100; - else - y -= page_y; + if (page_y < 0) + y -= -(page_y * v_h) / 100; + else + y -= page_y; } else if ((!strcmp(ev->keyname, "Next")) || (!strcmp(ev->keyname, "KP_Next"))) { - if (page_y < 0) - y += -(page_y * v_h) / 100; - else - y += page_y; + if (page_y < 0) + y += -(page_y * v_h) / 100; + else + y += page_y; } else return EINA_FALSE; @@ -194,10 +194,10 @@ const char *str; _mirrored_set(obj, elm_widget_mirrored_get(obj)); - elm_smart_scroller_object_theme_set(obj, wd->scr, + elm_smart_scroller_object_theme_set(obj, wd->scr, wd->widget_name, wd->widget_base, elm_widget_style_get(obj)); -// 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); edj = elm_smart_scroller_edje_object_get(wd->scr); str = edje_object_data_get(edj, "focus_highlight"); if ((str) && (!strcmp(str, "on"))) @@ -221,7 +221,7 @@ /* Try Focus cycle in subitem */ if ((elm_widget_can_focus_get(cur)) || (elm_widget_child_can_focus_get(cur))) - return elm_widget_focus_next_get(cur, dir, next); + return elm_widget_focus_next_get(cur, dir, next); /* Return */ *next = (Evas_Object *)obj; @@ -234,7 +234,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), - emission, source); + emission, source); } static void @@ -243,7 +243,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr), - emission, source, func_cb, data); + emission, source, func_cb, data); } static void @@ -251,8 +251,8 @@ { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full( - elm_smart_scroller_edje_object_get(wd->scr), emission, source, - func_cb, data); + elm_smart_scroller_edje_object_get(wd->scr), emission, source, + func_cb, data); } static void @@ -331,11 +331,11 @@ if (!wd) return; if (sub == wd->content) { - elm_widget_on_show_region_hook_set(wd->content, NULL, NULL); - evas_object_event_callback_del_full (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - wd->content = NULL; - _sizing_eval(obj); + elm_widget_on_show_region_hook_set(wd->content, NULL, NULL); + evas_object_event_callback_del_full (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + wd->content = NULL; + _sizing_eval(obj); } else if (sub == wd->scr) wd->scr = NULL; @@ -458,7 +458,7 @@ Evas_Coord minw, minh; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "scroller"); elm_widget_type_set(obj, "scroller"); elm_widget_sub_object_add(parent, obj); @@ -476,13 +476,13 @@ wd->widget_name = eina_stringshare_add("scroller"); wd->widget_base = eina_stringshare_add("base"); - + wd->scr = elm_smart_scroller_add(e); elm_smart_scroller_widget_set(wd->scr, obj); _theme_hook(obj); elm_widget_resize_object_set(obj, wd->scr); evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + _changed_size_hints, obj); edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh); evas_object_size_hint_min_set(obj, minw, minh); @@ -545,12 +545,12 @@ wd->content = content; if (content) { - elm_widget_on_show_region_hook_set(content, _show_region_hook, obj); - elm_widget_sub_object_add(obj, content); + elm_widget_on_show_region_hook_set(content, _show_region_hook, obj); + elm_widget_sub_object_add(obj, content); if (wd->scr) elm_smart_scroller_child_set(wd->scr, content); - evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); } _sizing_eval(obj); } @@ -601,7 +601,7 @@ /** * Set custom theme elements for the scroller - * + * * @param obj The scroller object * @param widget The widget name to use (default is "scroller") * @param base The base name to use (default is "base") @@ -691,9 +691,9 @@ Widget_Data *wd = elm_widget_data_get(obj); const Elm_Scroller_Policy map[3] = { - ELM_SMART_SCROLLER_POLICY_AUTO, - ELM_SMART_SCROLLER_POLICY_ON, - ELM_SMART_SCROLLER_POLICY_OFF + ELM_SMART_SCROLLER_POLICY_AUTO, + ELM_SMART_SCROLLER_POLICY_ON, + ELM_SMART_SCROLLER_POLICY_OFF }; if ((!wd) || (!wd->scr)) return; if ((policy_h >= 3) || (policy_v >= 3)) return; @@ -892,7 +892,7 @@ * * This enables or disabled event propagation from the scroller content to * the scroller and its parent. By default event propagation is disabled. - * + * * @param obj The scroller object * @param propagation If propagation is enabled or not * @@ -911,9 +911,9 @@ /** * Get event propagation for a scroller * - * This gets the event propagation for a scroller. See + * This gets the event propagation for a scroller. See * elm_scroller_propagate_events_set() for more information - * + * * @param obj The scroller object * @return The propagation state * Modified: trunk/elementary/src/lib/elm_separator.c =================================================================== --- trunk/elementary/src/lib/elm_separator.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_separator.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -82,7 +82,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "separator"); wd->horizontal = EINA_FALSE; elm_widget_type_set(obj, "separator"); Modified: trunk/elementary/src/lib/elm_slider.c =================================================================== --- trunk/elementary/src/lib/elm_slider.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_slider.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -174,13 +174,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->slider, "elm,action,focus", "elm"); - evas_object_focus_set(wd->slider, EINA_TRUE); + edje_object_signal_emit(wd->slider, "elm,action,focus", "elm"); + evas_object_focus_set(wd->slider, EINA_TRUE); } else { - edje_object_signal_emit(wd->slider, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->slider, EINA_FALSE); + edje_object_signal_emit(wd->slider, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->slider, EINA_FALSE); } } @@ -217,18 +217,18 @@ edje_object_part_text_set(wd->slider, "elm.text", wd->label); edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm"); } - + if (wd->units) edje_object_signal_emit(wd->slider, "elm,state,units,visible", "elm"); - + if (wd->horizontal) evas_object_size_hint_min_set(wd->spacer, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale, 1); else evas_object_size_hint_min_set(wd->spacer, 1, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale); - + if (wd->inverted) - edje_object_signal_emit(wd->slider, "elm,state,inverted,on", "elm"); - + edje_object_signal_emit(wd->slider, "elm,state,inverted,on", "elm"); + edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer); _units_set(obj); _indicator_set(obj); @@ -244,14 +244,14 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; if (elm_widget_disabled_get(obj)) - edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm"); + edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm"); else - edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm"); + edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm"); } static void _sizing_eval(Evas_Object *obj) -{ +{ Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; if (!wd) return; @@ -279,12 +279,12 @@ if (!wd) return; if (sub == wd->icon) { - edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm"); - evas_object_event_callback_del_full - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - wd->icon = NULL; - edje_object_message_signal_process(wd->slider); - _sizing_eval(obj); + edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm"); + evas_object_event_callback_del_full + (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + wd->icon = NULL; + edje_object_message_signal_process(wd->slider); + _sizing_eval(obj); } if (sub == wd->end) { @@ -316,21 +316,21 @@ double posx = 0.0, posy = 0.0, pos = 0.0, val; if (!wd) return; edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider", - &posx, &posy); + &posx, &posy); if (wd->horizontal) pos = posx; else pos = posy; rtl = elm_widget_mirrored_get(obj); if ((!rtl && wd->inverted) || (rtl && - ((!wd->horizontal && wd->inverted) || - (wd->horizontal && !wd->inverted)))) pos = 1.0 - pos; + ((!wd->horizontal && wd->inverted) || + (wd->horizontal && !wd->inverted)))) pos = 1.0 - pos; val = (pos * (wd->val_max - wd->val_min)) + wd->val_min; if (val != wd->val) { - wd->val = val; - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); - if (wd->delay) ecore_timer_del(wd->delay); - wd->delay = ecore_timer_add(0.2, _delay_change, obj); + wd->val = val; + evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + if (wd->delay) ecore_timer_del(wd->delay); + wd->delay = ecore_timer_add(0.2, _delay_change, obj); } } @@ -350,8 +350,8 @@ rtl = elm_widget_mirrored_get(obj); if ((!rtl && wd->inverted) || (rtl && - ((!wd->horizontal && wd->inverted) || - (wd->horizontal && !wd->inverted)))) pos = 1.0 - pos; + ((!wd->horizontal && wd->inverted) || + (wd->horizontal && !wd->inverted)))) pos = 1.0 - pos; edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", pos, pos); } @@ -362,10 +362,10 @@ if (!wd) return; if (wd->units) { - char buf[1024]; + char buf[1024]; - snprintf(buf, sizeof(buf), wd->units, wd->val); - edje_object_part_text_set(wd->slider, "elm.units", buf); + snprintf(buf, sizeof(buf), wd->units, wd->val); + edje_object_part_text_set(wd->slider, "elm.units", buf); } else edje_object_part_text_set(wd->slider, "elm.units", NULL); @@ -378,15 +378,15 @@ if (!wd) return; if (wd->indicator_format_func) { - const char *buf; - buf = wd->indicator_format_func(wd->val); - edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf); + const char *buf; + buf = wd->indicator_format_func(wd->val); + edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf); } else if (wd->indicator) { - char buf[1024]; - snprintf(buf, sizeof(buf), wd->indicator, wd->val); - edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf); + char buf[1024]; + snprintf(buf, sizeof(buf), wd->indicator, wd->val); + edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf); } else edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL); @@ -463,7 +463,7 @@ Evas_Event_Mouse_Down *ev = event_info; Evas_Coord x, y, w, h; double button_x, button_y; - + evas_object_geometry_get(wd->spacer, &x, &y, &w, &h); edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider", &button_x, &button_y); if (wd->horizontal) @@ -472,7 +472,7 @@ if (button_x > 1) button_x = 1; if (button_x < 0) button_x = 0; } - else + else { button_y = ((double)ev->output.y - (double)y) / (double)h; if (button_y > 1) button_y = 1; @@ -480,7 +480,7 @@ } edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", button_x, button_y); evas_event_feed_mouse_cancel(e, 0, NULL); - evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, 0, NULL); + evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, 0, NULL); } /** @@ -499,7 +499,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "slider"); elm_widget_type_set(obj, "slider"); elm_widget_sub_object_add(parent, obj); @@ -525,7 +525,7 @@ edje_object_signal_callback_add(wd->slider, "drag,stop", "*", _drag_stop, obj); edje_object_signal_callback_add(wd->slider, "drag,step", "*", _drag_step, obj); edje_object_signal_callback_add(wd->slider, "drag,page", "*", _drag_stop, obj); -// edje_object_signal_callback_add(wd->slider, "drag,set", "*", _drag_stop, obj); + // edje_object_signal_callback_add(wd->slider, "drag,set", "*", _drag_stop, obj); edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", 0.0, 0.0); wd->spacer = evas_object_rectangle_add(e); @@ -562,13 +562,13 @@ eina_stringshare_replace(&wd->label, label); if (label) { - edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm"); - edje_object_message_signal_process(wd->slider); + edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm"); + edje_object_message_signal_process(wd->slider); } else { - edje_object_signal_emit(wd->slider, "elm,state,text,hidden", "elm"); - edje_object_message_signal_process(wd->slider); + edje_object_signal_emit(wd->slider, "elm,state,text,hidden", "elm"); + edje_object_message_signal_process(wd->slider); } edje_object_part_text_set(wd->slider, "elm.text", label); _sizing_eval(obj); @@ -617,12 +617,12 @@ wd->icon = icon; if (icon) { - elm_widget_sub_object_add(obj, icon); - evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->slider, "elm.swallow.icon", icon); - edje_object_signal_emit(wd->slider, "elm,state,icon,visible", "elm"); - edje_object_message_signal_process(wd->slider); + elm_widget_sub_object_add(obj, icon); + evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->slider, "elm.swallow.icon", icon); + edje_object_signal_emit(wd->slider, "elm,state,icon,visible", "elm"); + edje_object_message_signal_process(wd->slider); } _sizing_eval(obj); } @@ -648,12 +648,12 @@ if (!wd) return NULL; if (wd->icon) { - elm_widget_sub_object_del(obj, wd->icon); - ret = wd->icon; - edje_object_part_unswallow(wd->slider, wd->icon); - edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm"); - wd->icon = NULL; - _sizing_eval(obj); + elm_widget_sub_object_del(obj, wd->icon); + ret = wd->icon; + edje_object_part_unswallow(wd->slider, wd->icon); + edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm"); + wd->icon = NULL; + _sizing_eval(obj); } return ret; } @@ -702,9 +702,9 @@ else evas_object_size_hint_min_set(wd->spacer, 1, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale); if (wd->indicator_show) - edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm"); + edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm"); else - edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm"); + edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm"); edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer); _sizing_eval(obj); } @@ -753,13 +753,13 @@ eina_stringshare_replace(&wd->units, units); if (units) { - edje_object_signal_emit(wd->slider, "elm,state,units,visible", "elm"); - edje_object_message_signal_process(wd->slider); + edje_object_signal_emit(wd->slider, "elm,state,units,visible", "elm"); + edje_object_message_signal_process(wd->slider); } else { - edje_object_signal_emit(wd->slider, "elm,state,units,hidden", "elm"); - edje_object_message_signal_process(wd->slider); + edje_object_signal_emit(wd->slider, "elm,state,units,hidden", "elm"); + edje_object_message_signal_process(wd->slider); } _units_set(obj); _sizing_eval(obj); @@ -1053,12 +1053,12 @@ wd->end = end; if (end) { - elm_widget_sub_object_add(obj, end); - evas_object_event_callback_add(end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->slider, "elm.swallow.end", end); - edje_object_signal_emit(wd->slider, "elm,state,end,visible", "elm"); - edje_object_message_signal_process(wd->slider); + elm_widget_sub_object_add(obj, end); + evas_object_event_callback_add(end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->slider, "elm.swallow.end", end); + edje_object_signal_emit(wd->slider, "elm,state,end,visible", "elm"); + edje_object_message_signal_process(wd->slider); } _sizing_eval(obj); } @@ -1084,12 +1084,12 @@ if (!wd) return NULL; if (wd->end) { - elm_widget_sub_object_del(obj, wd->end); - ret = wd->end; - edje_object_part_unswallow(wd->slider, wd->end); - edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm"); - wd->end = NULL; - _sizing_eval(obj); + elm_widget_sub_object_del(obj, wd->end); + ret = wd->end; + edje_object_part_unswallow(wd->slider, wd->end); + edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm"); + wd->end = NULL; + _sizing_eval(obj); } return ret; } @@ -1130,12 +1130,12 @@ ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (show) { - wd->indicator_show = EINA_TRUE; - edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm"); + wd->indicator_show = EINA_TRUE; + edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm"); } else { - wd->indicator_show = EINA_FALSE; - edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm"); + wd->indicator_show = EINA_FALSE; + edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm"); } } Modified: trunk/elementary/src/lib/elm_slideshow.c =================================================================== --- trunk/elementary/src/lib/elm_slideshow.c 2011-04-01 11:20:18 UTC (rev 58249) +++ trunk/elementary/src/lib/elm_slideshow.c 2011-04-01 11:24:15 UTC (rev 58250) @@ -45,8 +45,8 @@ Eina_Bool loop:1; struct { - const char *current; - Eina_List *list; //list of const char * + const char *current; + Eina_List *list; //list of const char * } layout; }; @@ -112,7 +112,7 @@ elm_widget_stringlist_free(wd->transitions); if (wd->timer) ecore_timer_del(wd->timer); EINA_LIST_FREE(wd->layout.list, layout) - eina_stringshare_del(layout); + eina_stringshare_del(layout); free(wd); } @@ -123,13 +123,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->slideshow, "elm,action,focus", "elm"); - evas_object_focus_set(wd->slideshow, EINA_TRUE); + edje_object_signal_emit(wd->slideshow, "elm,action,focus", "elm"); + evas_object_focus_set(wd->slideshow, EINA_TRUE); } else { - edje_object_signal_emit(wd->slideshow, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->slideshow, EINA_FALSE); + edje_object_signal_emit(wd->slideshow, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->slideshow, EINA_FALSE); } } @@ -168,20 +168,20 @@ static Elm_Slideshow_Item* _item_prev_get(Elm_Slideshow_Item* item) { - Widget_Data *wd = elm_widget_data_get(item->base.widget); - Elm_Slideshow_Item* prev = eina_list_data_get(eina_list_prev(item->l)); - if((!prev) && (wd->loop)) - prev = eina_list_data_get(eina_list_last(item->l)); - return prev; + Widget_Data *wd = elm_widget_data_get(item->base.widget); + Elm_Slideshow_Item* prev = eina_list_data_get(eina_list_prev(item->l)); + if((!prev) && (wd->loop)) + prev = eina_list_data_get(eina_list_last(item->l)); + return prev; } static Elm_Slideshow_Item* _item_next_get(Elm_Slideshow_Item* item) { - Widget_Data *wd = elm_widget_data_get(item->base.widget); - Elm_Slideshow_Item* next = eina_list_data_get(eina_list_next(item->l)); - if((!next) && (wd->loop)) - next = eina_list_data_get(wd->items); - return next; + Widget_Data *wd = elm_widget_data_get(item->base.widget); + Elm_Slideshow_Item* next = eina_list_data_get(eina_list_next(item->l)); + if((!next) && (wd->loop)) + next = eina_list_data_get(wd->items); + return next; } @@ -256,28 +256,28 @@ static void _end(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { - Elm_Slideshow_Item *item; - Widget_Data *wd = elm_widget_data_get(data); - if (!wd) return; + Elm_Slideshow_Item *item; + Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; - item = wd->previous; - if(item) - { - edje_object_part_unswallow(NULL, item->base.view); - evas_object_hide(item->base.view); - wd->previous = NULL; - } + item = wd->previous; + if(item) + { + edje_object_part_unswallow(NULL, item->base.view); + evas_object_hide(item->base.view); + wd->previous = NULL; + } - item = wd->current; - if ((!item) || (!item->base.view)) return; + item = wd->current; + if ((!item) || (!item->base.view)) return; - _item_realize(item); - edje_object_part_unswallow(NULL, item->base.view); - evas_object_show(item->base.view); + _item_realize(item); + edje_object_part_unswallow(NULL, item->base.view); + evas_object_show(item->base.view); - edje_object_signal_emit(wd->slideshow, "anim,end", "slideshow"); - edje_object_part_swallow(wd->slideshow, "elm.swallow.1", item->base.view); + edje_object_signal_emit(wd->slideshow, "anim,end", "slideshow"); + edje_object_part_swallow(wd->slideshow, "elm.swallow.1", item->base.view); } @@ -310,7 +310,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "slideshow"); elm_widget_type_set(obj, "slideshow"); elm_widget_sub_object_add(parent, obj); @@ -336,7 +336,7 @@ wd->layout.list = elm_widget_stringlist_get(edje_object_data_get(wd->slideshow, "layouts")); if (eina_list_count(wd->layout.list) > 0) - wd->layout.current = eina_list_data_get(wd->layout.list); + wd->layout.current = eina_list_data_get(wd->layout.list); edje_object_signal_callback_add(wd->slideshow, "end", "slideshow", _end, obj); @@ -404,7 +404,7 @@ if (wd->timer) ecore_timer_del(wd->timer); if (wd->timeout > 0.0) - wd->timer = ecore_timer_add(wd->timeout, _timer_cb, item->base.widget); + wd->timer = ecore_timer_add(wd->timeout, _timer_cb, item->base.widget); _item_realize(next); edje_object_part_swallow(wd->slideshow, "elm.swallow.2", next->base.view); evas_object_show(next->base.view); @@ -431,9 +431,9 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - + if (wd->current) - next = _item_next_get(wd->current); + next = _item_next_get(wd->current); if... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2011-04-01 11:27:07
|
Log: elementary / menu, notify, list, panes, module, map, pager, panel, mapbuf - removed white spaces Author: hermet Date: 2011-04-01 04:26:58 -0700 (Fri, 01 Apr 2011) New Revision: 58251 Trac: http://trac.enlightenment.org/e/changeset/58251 Modified: trunk/elementary/src/lib/elm_list.c trunk/elementary/src/lib/elm_map.c trunk/elementary/src/lib/elm_mapbuf.c trunk/elementary/src/lib/elm_menu.c trunk/elementary/src/lib/elm_module.c trunk/elementary/src/lib/elm_notify.c trunk/elementary/src/lib/elm_pager.c trunk/elementary/src/lib/elm_panel.c trunk/elementary/src/lib/elm_panes.c Modified: trunk/elementary/src/lib/elm_list.c =================================================================== --- trunk/elementary/src/lib/elm_list.c 2011-04-01 11:24:15 UTC (rev 58250) +++ trunk/elementary/src/lib/elm_list.c 2011-04-01 11:26:58 UTC (rev 58251) @@ -25,7 +25,7 @@ int walking; int movements; struct { - Evas_Coord x, y; + Evas_Coord x, y; } history[SWIPE_MOVES]; Eina_Bool swipe : 1; Eina_Bool fix_pending : 1; @@ -85,32 +85,32 @@ static Eina_Bool _deselect_all_items(Widget_Data *wd); #define ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, ...) \ - ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); \ - if (it->deleted) \ - { \ - ERR("ERROR: "#it" has been DELETED.\n"); \ - return __VA_ARGS__; \ - } + ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); \ +if (it->deleted) \ +{ \ + ERR("ERROR: "#it" has been DELETED.\n"); \ + return __VA_ARGS__; \ +} static inline void _elm_list_item_free(Elm_List_Item *it) { evas_object_event_callback_del_full - (it->base.view, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it); + (it->base.view, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it); evas_object_event_callback_del_full - (it->base.view, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it); + (it->base.view, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it); evas_object_event_callback_del_full - (it->base.view, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it); + (it->base.view, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it); if (it->icon) evas_object_event_callback_del_full - (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, it->base.widget); + (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, it->base.widget); if (it->end) evas_object_event_callback_del_full - (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, it->base.widget); + (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, it->base.widget); eina_stringshare_del(it->label); @@ -259,9 +259,9 @@ } else if (!strcmp(ev->keyname, "Escape")) { - if (!_deselect_all_items(wd)) return EINA_FALSE; - ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - return EINA_TRUE; + if (!_deselect_all_items(wd)) return EINA_FALSE; + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + return EINA_TRUE; } else return EINA_FALSE; @@ -383,8 +383,8 @@ { if (wd->walking < 0) { - ERR("ERROR: walking was negative. fixed!\n"); - wd->walking = 0; + ERR("ERROR: walking was negative. fixed!\n"); + wd->walking = 0; } wd->walking++; } @@ -395,8 +395,8 @@ wd->walking--; if (wd->walking < 0) { - ERR("ERROR: walking became negative. fixed!\n"); - wd->walking = 0; + ERR("ERROR: walking became negative. fixed!\n"); + wd->walking = 0; } if (wd->walking) @@ -531,8 +531,8 @@ { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full( - elm_smart_scroller_edje_object_get(wd->scr), - emission, source, func_cb, data); + elm_smart_scroller_edje_object_get(wd->scr), + emission, source, func_cb, data); } static void @@ -568,7 +568,7 @@ elm_smart_scroller_object_theme_set(obj, wd->scr, "list", "base", elm_widget_style_get(obj)); -// 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); edj = elm_smart_scroller_edje_object_get(wd->scr); str = edje_object_data_get(edj, "focus_highlight"); if ((str) && (!strcmp(str, "on"))) @@ -636,8 +636,8 @@ if (it->icon == sub) it->icon = NULL; if (it->end == sub) it->end = NULL; evas_object_event_callback_del_full - (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, - obj); + (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, + obj); if (!wd->walking) { _fix_items(obj); @@ -661,7 +661,7 @@ if (!wd) return; ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); if (it->hilighted) return; - + evas_object_ref(obj); _elm_list_walk(wd); @@ -690,11 +690,11 @@ } it->selected = EINA_TRUE; wd->selected = eina_list_append(wd->selected, it); - - call: + +call: evas_object_ref(obj); _elm_list_walk(wd); - + if (it->func) it->func((void *)it->base.data, it->base.widget, it); evas_object_smart_callback_call(obj, "selected", it); it->wd->last_selected_item = it; @@ -713,17 +713,17 @@ if (!wd) return; ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); if (!it->hilighted) return; - + evas_object_ref(obj); _elm_list_walk(wd); - + edje_object_signal_emit(it->base.view, "elm,state,unselected", "elm"); stacking = edje_object_data_get(it->base.view, "stacking"); selectraise = edje_object_data_get(it->base.view, "selectraise"); if ((selectraise) && (!strcmp(selectraise, "on"))) { if ((stacking) && (!strcmp(stacking, "below"))) - evas_object_lower(it->base.view); + evas_object_lower(it->base.view); } it->hilighted = EINA_FALSE; if (it->selected) @@ -732,7 +732,7 @@ wd->selected = eina_list_remove(wd->selected, it); evas_object_smart_callback_call(it->base.widget, "unselected", it); } - + _elm_list_unwalk(wd); evas_object_unref(obj); } @@ -760,10 +760,10 @@ if (!wd) return; ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); - + evas_object_ref(obj2); _elm_list_walk(wd); - + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) { if (!wd->on_hold) @@ -783,12 +783,12 @@ wd->history[wd->movements].x = ev->cur.canvas.x; wd->history[wd->movements].y = ev->cur.canvas.y; if (abs((wd->history[wd->movements].x - wd->history[0].x)) > 40) - wd->swipe = EINA_TRUE; + wd->swipe = EINA_TRUE; else - wd->movements++; + wd->movements++; } } - + _elm_list_unwalk(wd); evas_object_unref(obj2); } @@ -837,7 +837,7 @@ wd->longpressed = EINA_TRUE; evas_object_smart_callback_call(it->base.widget, "longpressed", it); - end: +end: return ECORE_CALLBACK_CANCEL; } @@ -876,10 +876,10 @@ else wd->on_hold = EINA_FALSE; if (wd->on_hold) return; wd->wasselected = it->selected; - + evas_object_ref(obj2); _elm_list_walk(wd); - + _item_hilight(it); wd->longpressed = EINA_FALSE; if (it->long_timer) ecore_timer_del(it->long_timer); @@ -891,7 +891,7 @@ evas_object_smart_callback_call(it->base.widget, "clicked", it); wd->swipe = EINA_FALSE; wd->movements = 0; - + _elm_list_unwalk(wd); evas_object_unref(obj2); } @@ -936,7 +936,7 @@ if (it->disabled) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; - + evas_object_ref(obj2); _elm_list_walk(wd); @@ -954,7 +954,7 @@ if (!it->selected) { while (wd->selected) - _item_unselect(wd->selected->data); + _item_unselect(wd->selected->data); _item_hilight(it); _item_select(it); } @@ -1100,116 +1100,116 @@ i = 0; EINA_LIST_FOREACH(wd->items, l, it) { - if (it->deleted) + if (it->deleted) continue; - it->even = i & 0x1; - if ((it->even != it->is_even) || (!it->fixed) || (redo)) - { - const char *stacking; + it->even = i & 0x1; + if ((it->even != it->is_even) || (!it->fixed) || (redo)) + { + const char *stacking; /* FIXME: separators' themes seem to be b0rked */ - if (it->is_separator) - _elm_theme_object_set(obj, it->base.view, "separator", + if (it->is_separator) + _elm_theme_object_set(obj, it->base.view, "separator", wd->h_mode ? "horizontal" : "vertical", style); - else if (wd->mode == ELM_LIST_COMPRESS) - { - if (it->even) - _elm_theme_object_set(obj, it->base.view, "list", + else if (wd->mode == ELM_LIST_COMPRESS) + { + if (it->even) + _elm_theme_object_set(obj, it->base.view, "list", it_compress, style); - else - _elm_theme_object_set(obj, it->base.view, "list", + else + _elm_theme_object_set(obj, it->base.view, "list", it_compress_odd, style); - } - else - { - if (it->even) - _elm_theme_object_set(obj, it->base.view, "list", it_plain, + } + else + { + if (it->even) + _elm_theme_object_set(obj, it->base.view, "list", it_plain, style); - else - _elm_theme_object_set(obj, it->base.view, "list", it_odd, + else + _elm_theme_object_set(obj, it->base.view, "list", it_odd, style); - } - stacking = edje_object_data_get(it->base.view, "stacking"); - if (stacking) - { - if (!strcmp(stacking, "below")) - evas_object_lower(it->base.view); - else if (!strcmp(stacking, "above")) - evas_object_raise(it->base.view); - } - edje_object_part_text_set(it->base.view, "elm.text", it->label); + } + stacking = edje_object_data_get(it->base.view, "stacking"); + if (stacking) + { + if (!strcmp(stacking, "below")) + evas_object_lower(it->base.view); + else if (!strcmp(stacking, "above")) + evas_object_raise(it->base.view); + } + edje_object_part_text_set(it->base.view, "elm.text", it->label); - if ((!it->icon) && (minh[0] > 0)) - { - it->icon = evas_object_rectangle_add(evas_object_evas_get(it->base.view)); - evas_object_color_set(it->icon, 0, 0, 0, 0); - it->dummy_icon = EINA_TRUE; - } - if ((!it->end) && (minh[1] > 0)) - { - it->end = evas_object_rectangle_add(evas_object_evas_get(it->base.view)); - evas_object_color_set(it->end, 0, 0, 0, 0); - it->dummy_end = EINA_TRUE; - } - if (it->icon) - { - evas_object_size_hint_min_set(it->icon, minw[0], minh[0]); - evas_object_size_hint_max_set(it->icon, 99999, 99999); - edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon); - } - if (it->end) - { - evas_object_size_hint_min_set(it->end, minw[1], minh[1]); - evas_object_size_hint_max_set(it->end, 99999, 99999); - edje_object_part_swallow(it->base.view, "elm.swallow.end", it->end); - } - if (!it->fixed) - { - // this may call up user and it may modify the list item - // but we're safe as we're flagged as walking. - // just don't process further - edje_object_message_signal_process(it->base.view); - if (it->deleted) - continue; - mw = mh = -1; - elm_coords_finger_size_adjust(1, &mw, 1, &mh); - edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 1, &mh); - evas_object_size_hint_min_set(it->base.view, mw, mh); - evas_object_show(it->base.view); - } - if ((it->selected) || (it->hilighted)) - { - const char *selectraise; + if ((!it->icon) && (minh[0] > 0)) + { + it->icon = evas_object_rectangle_add(evas_object_evas_get(it->base.view)); + evas_object_color_set(it->icon, 0, 0, 0, 0); + it->dummy_icon = EINA_TRUE; + } + if ((!it->end) && (minh[1] > 0)) + { + it->end = evas_object_rectangle_add(evas_object_evas_get(it->base.view)); + evas_object_color_set(it->end, 0, 0, 0, 0); + it->dummy_end = EINA_TRUE; + } + if (it->icon) + { + evas_object_size_hint_min_set(it->icon, minw[0], minh[0]); + evas_object_size_hint_max_set(it->icon, 99999, 99999); + edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon); + } + if (it->end) + { + evas_object_size_hint_min_set(it->end, minw[1], minh[1]); + evas_object_size_hint_max_set(it->end, 99999, 99999); + edje_object_part_swallow(it->base.view, "elm.swallow.end", it->end); + } + if (!it->fixed) + { + // this may call up user and it may modify the list item + // but we're safe as we're flagged as walking. + // just don't process further + edje_object_message_signal_process(it->base.view); + if (it->deleted) + continue; + mw = mh = -1; + elm_coords_finger_size_adjust(1, &mw, 1, &mh); + edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw, mh); + elm_coords_finger_size_adjust(1, &mw, 1, &mh); + evas_object_size_hint_min_set(it->base.view, mw, mh); + evas_object_show(it->base.view); + } + if ((it->selected) || (it->hilighted)) + { + const char *selectraise; - // this may call up user and it may modify the list item - // but we're safe as we're flagged as walking. - // just don't process further - edje_object_signal_emit(it->base.view, "elm,state,selected", "elm"); - if (it->deleted) - continue; + // this may call up user and it may modify the list item + // but we're safe as we're flagged as walking. + // just don't process further + edje_object_signal_emit(it->base.view, "elm,state,selected", "elm"); + if (it->deleted) + continue; - selectraise = edje_object_data_get(it->base.view, "selectraise"); - if ((selectraise) && (!strcmp(selectraise, "on"))) - evas_object_raise(it->base.view); - } + selectraise = edje_object_data_get(it->base.view, "selectraise"); + if ((selectraise) && (!strcmp(selectraise, "on"))) + evas_object_raise(it->base.view); + } if (it->disabled) edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm"); - it->fixed = EINA_TRUE; - it->is_even = it->even; - } - i++; + it->fixed = EINA_TRUE; + it->is_even = it->even; + } + i++; } mw = 0; mh = 0; evas_object_size_hint_min_get(wd->box, &mw, &mh); _elm_list_mode_set_internal(wd); - + _elm_list_unwalk(wd); evas_object_unref(obj); } @@ -1273,7 +1273,7 @@ Evas_Coord minw, minh; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "list"); elm_widget_type_set(obj, "list"); elm_widget_sub_object_add(parent, obj); @@ -1873,13 +1873,13 @@ if (!wd->multi) { while (wd->selected) - _item_unselect(wd->selected->data); + _item_unselect(wd->selected->data); } _item_hilight(it); _item_select(it); } else - _item_unselect(it); + _item_unselect(it); _elm_list_unwalk(wd); evas_object_unref(obj); @@ -2487,8 +2487,8 @@ if (!wd) return; if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || (policy_v >= ELM_SCROLLER_POLICY_LAST)) - if (wd->scr) - elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v); + if (wd->scr) + elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v); } EAPI void Modified: trunk/elementary/src/lib/elm_map.c =================================================================== --- trunk/elementary/src/lib/elm_map.c 2011-04-01 11:24:15 UTC (rev 58250) +++ trunk/elementary/src/lib/elm_map.c 2011-04-01 11:26:58 UTC (rev 58251) @@ -106,14 +106,14 @@ int zoom_displayed; struct _Elm_Map_Marker_Class_Func { - ElmMapMarkerGetFunc get; - ElmMapMarkerDelFunc del; //if NULL the object will be destroyed with evas_object_del() - ElmMapMarkerIconGetFunc icon_get; + ElmMapMarkerGetFunc get; + ElmMapMarkerDelFunc del; //if NULL the object will be destroyed with evas_object_del() + ElmMapMarkerIconGetFunc icon_get; } func; struct { //this part is private, do not modify these values - Eina_Bool set : 1; - Evas_Coord edje_w, edje_h; + Eina_Bool set : 1; + Evas_Coord edje_w, edje_h; } priv; }; @@ -142,16 +142,16 @@ Eina_Bool hide : 1; struct { - ElmMapGroupIconGetFunc icon_get; + ElmMapGroupIconGetFunc icon_get; } func; - + struct { //this part is private, do not modify these values - Eina_Bool set : 1; - Evas_Coord edje_w, edje_h; - Evas_Coord edje_max_w, edje_max_h; - - Eina_List *objs_used; - Eina_List *objs_notused; + Eina_Bool set : 1; + Evas_Coord edje_w, edje_h; + Evas_Coord edje_max_w, edje_max_h; + + Eina_List *objs_used; + Eina_List *objs_notused; } priv; }; @@ -182,7 +182,7 @@ //Evas_Object *txt; const char *file; struct { - int x, y, w, h; + int x, y, w, h; } src, out; Eina_Bool want : 1; Eina_Bool download : 1; @@ -222,15 +222,15 @@ Ecore_Animator *zoom_animator; double t_start, t_end; struct { - int w, h; - int ow, oh, nw, nh; - struct { - double x, y; - } spos; + int w, h; + int ow, oh, nw, nh; + struct { + double x, y; + } spos; } size; struct { - Eina_Bool show : 1; - Evas_Coord x, y ,w ,h; + Eina_Bool show : 1; + Evas_Coord x, y ,w ,h; } show; int tsize; int nosmooth; @@ -242,10 +242,10 @@ Eina_Bool paused : 1; Eina_Bool paused_markers : 1; Eina_Bool pinch_zoom : 1; - + struct { - Eina_Bool enabled; - double lon, lat; + Eina_Bool enabled; + double lon, lat; } center_on; Ecore_Job *markers_place_job; @@ -286,16 +286,16 @@ struct _Event { int device; - + struct { - Evas_Coord x, y; + Evas_Coord x, y; } prev; - + Evas_Coord x, y, w, h; - + Evas_Object *object; Ecore_Timer *hold_timer; - + int pinch_dis; }; @@ -317,21 +317,21 @@ static const char SIG_ZOOM_STOP[] = "zoom,stop"; static const char SIG_DOWNLOADED[] = "downloaded"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CHANGED, ""}, - {SIG_CLICKED, ""}, - {SIG_CLICKED_DOUBLE, ""}, - {SIG_LOADED_DETAIL, ""}, - {SIG_LOAD_DETAIL, ""}, - {SIG_LONGPRESSED, ""}, - {SIG_PRESS, ""}, - {SIG_SCROLL, ""}, - {SIG_SCROLL_DRAG_START, ""}, - {SIG_SCROLL_DRAG_STOP, ""}, - {SIG_ZOOM_CHANGE, ""}, - {SIG_ZOOM_START, ""}, - {SIG_ZOOM_STOP, ""}, - {SIG_DOWNLOADED, ""}, - {NULL, NULL} + {SIG_CHANGED, ""}, + {SIG_CLICKED, ""}, + {SIG_CLICKED_DOUBLE, ""}, + {SIG_LOADED_DETAIL, ""}, + {SIG_LOAD_DETAIL, ""}, + {SIG_LONGPRESSED, ""}, + {SIG_PRESS, ""}, + {SIG_SCROLL, ""}, + {SIG_SCROLL_DRAG_START, ""}, + {SIG_SCROLL_DRAG_STOP, ""}, + {SIG_ZOOM_CHANGE, ""}, + {SIG_ZOOM_START, ""}, + {SIG_ZOOM_STOP, ""}, + {SIG_DOWNLOADED, ""}, + {NULL, NULL} }; static void _pan_calculate(Evas_Object *obj); @@ -378,10 +378,10 @@ Widget_Data *wd = elm_widget_data_get(obj); Eina_List *l; Event *ev; - + EINA_LIST_FOREACH(wd->s_event_list, l, ev) { - if (ev->device) return ev->device; + if (ev->device) return ev->device; } return 0; } @@ -399,9 +399,9 @@ { Widget_Data *wd = elm_widget_data_get(data); Event *ev = calloc(1, sizeof(Event)); - + EINA_SAFETY_ON_NULL_RETURN_VAL(ev, NULL); - + ev->object = obj; ev->device = device; evas_object_geometry_get(obj, &ev->x, &ev->y, &ev->w, &ev->h); @@ -415,7 +415,7 @@ Widget_Data *wd = elm_widget_data_get(data); Eina_List *l; Event *ev; - + EINA_LIST_FOREACH(wd->s_event_list, l, ev) { if (ev->device == device) break; @@ -449,16 +449,16 @@ m->api = malloc(sizeof(Mod_Api)); if (!m->api) return NULL; ((Mod_Api *)(m->api) )->obj_hook = - _elm_module_symbol_get(m, "obj_hook"); + _elm_module_symbol_get(m, "obj_hook"); ((Mod_Api *)(m->api) )->obj_unhook = - _elm_module_symbol_get(m, "obj_unhook"); + _elm_module_symbol_get(m, "obj_unhook"); ((Mod_Api *)(m->api) )->obj_url_request = - _elm_module_symbol_get(m, "obj_url_request"); + _elm_module_symbol_get(m, "obj_url_request"); ((Mod_Api *)(m->api) )->obj_convert_coord_into_geo = - _elm_module_symbol_get(m, "obj_convert_coord_into_geo"); + _elm_module_symbol_get(m, "obj_convert_coord_into_geo"); ((Mod_Api *)(m->api) )->obj_convert_geo_into_coord = - _elm_module_symbol_get(m, "obj_convert_geo_into_coord"); - ok: + _elm_module_symbol_get(m, "obj_convert_geo_into_coord"); +ok: return m->api; } @@ -483,11 +483,11 @@ ox + 0 - px + ax, oy + 0 - py + ay); evas_object_resize(wd->rect, gw, gh); - + if (wd->show.show) { - wd->show.show = EINA_FALSE; - elm_smart_scroller_child_region_show(wd->scr, wd->show.x, wd->show.y, wd->show.w, wd->show.h); + wd->show.show = EINA_FALSE; + elm_smart_scroller_child_region_show(wd->scr, wd->show.x, wd->show.y, wd->show.w, wd->show.h); } } @@ -516,13 +516,13 @@ if (wd->zoom != wd->marker_zoom) { - EINA_LIST_FREE(wd->cells_displayed, cell) - { - EINA_LIST_FOREACH(eina_matrixsparse_cell_data_get(cell), l, group) - { - if (group->obj) _group_object_free(group); - } - } + EINA_LIST_FREE(wd->cells_displayed, cell) + { + EINA_LIST_FOREACH(eina_matrixsparse_cell_data_get(cell), l, group) + { + if (group->obj) _group_object_free(group); + } + } } wd->marker_zoom = wd->zoom; @@ -542,97 +542,97 @@ //hide groups no more displayed EINA_LIST_FREE(wd->cells_displayed, cell) { - eina_matrixsparse_cell_position_get(cell, (unsigned long *)&y, (unsigned long *)&x); - if ((y < g_yy) || (y > g_yy + g_hh) || (x < g_xx) || (x > g_xx + g_ww)) - { - EINA_LIST_FOREACH(eina_matrixsparse_cell_data_get(cell), l, group) - { - if (group->obj) _group_object_free(group); - } - } + eina_matrixsparse_cell_position_get(cell, (unsigned long *)&y, (unsigned long *)&x); + if ((y < g_yy) || (y > g_yy + g_hh) || (x < g_xx) || (x > g_xx + g_ww)) + { + EINA_LIST_FOREACH(eina_matrixsparse_cell_data_get(cell), l, group) + { + if (group->obj) _group_object_free(group); + } + } } for (y = g_yy; y <= g_yy + g_hh; y++) { - for (x = g_xx; x <= g_xx + g_ww; x++) - { - if (!wd->markers[wd->zoom]) continue; - eina_matrixsparse_cell_idx_get(wd->markers[wd->zoom], y, x, &cell); - if (!cell) continue; - wd->cells_displayed = eina_list_append(wd->cells_displayed, cell); - markers = eina_matrixsparse_cell_data_get(cell); - EINA_LIST_FOREACH(markers, l, group) - { - if (!group->markers) continue; - if (group->clas->zoom_displayed > wd->zoom) continue; + for (x = g_xx; x <= g_xx + g_ww; x++) + { + if (!wd->markers[wd->zoom]) continue; + eina_matrixsparse_cell_idx_get(wd->markers[wd->zoom], y, x, &cell); + if (!cell) continue; + wd->cells_displayed = eina_list_append(wd->cells_displayed, cell); + markers = eina_matrixsparse_cell_data_get(cell); + EINA_LIST_FOREACH(markers, l, group) + { + if (!group->markers) continue; + if (group->clas->zoom_displayed > wd->zoom) continue; - xx = group->x; - yy = group->y; - ww = group->w; - hh = group->h; + xx = group->x; + yy = group->y; + ww = group->w; + hh = group->h; - if (eina_list_count(group->markers) == 1) - { - Elm_Map_Marker *m = eina_list_data_get(group->markers); - ww = m->clas->priv.edje_w; - hh = m->clas->priv.edje_h; - } + if (eina_list_count(group->markers) == 1) + { + Elm_Map_Marker *m = eina_list_data_get(group->markers); + ww = m->clas->priv.edje_w; + hh = m->clas->priv.edje_h; + } - if (ww <= 0) ww = 1; - if (hh <= 0) hh = 1; + if (ww <= 0) ww = 1; + if (hh <= 0) hh = 1; - if ((gw != g->w) && (g->w > 0)) - { - tx = xx; - xx = ((long long )gw * xx) / g->w; - ww = (((long long)gw * (tx + ww)) / g->w) - xx; - } - if ((gh != g->h) && (g->h > 0)) - { - ty = yy; - yy = ((long long)gh * yy) / g->h; - hh = (((long long)gh * (ty + hh)) / g->h) - yy; - } + if ((gw != g->w) && (g->w > 0)) + { + tx = xx; + xx = ((long long )gw * xx) / g->w; + ww = (((long long)gw * (tx + ww)) / g->w) - xx; + } + if ((gh != g->h) && (g->h > 0)) + { + ty = yy; + yy = ((long long)gh * yy) / g->h; + hh = (((long long)gh * (ty + hh)) / g->h) - yy; + } - if ((!group->clas->hide) + if ((!group->clas->hide) && (xx-px+ax+ox >= ox) && (xx-px+ax+ox<= ox+ow) && (yy-py+ay+oy >= oy) && (yy-py+ay+oy<= oy+oh)) - { - if (!group->obj) _group_object_create(group); + { + if (!group->obj) _group_object_create(group); - if (group->update_nbelems) - { - group->update_nbelems = EINA_FALSE; - if (eina_list_count(group->markers) > 1) - { - snprintf(buf, sizeof(buf), "%d", eina_list_count(group->markers)); - edje_object_part_text_set(elm_layout_edje_get(group->obj), "elm.text", buf); - } - else - edje_object_part_text_set(elm_layout_edje_get(group->obj), "elm.text", ""); - } - evas_object_move(group->obj, + if (group->update_nbelems) + { + group->update_nbelems = EINA_FALSE; + if (eina_list_count(group->markers) > 1) + { + snprintf(buf, sizeof(buf), "%d", eina_list_count(group->markers)); + edje_object_part_text_set(elm_layout_edje_get(group->obj), "elm.text", buf); + } + else + edje_object_part_text_set(elm_layout_edje_get(group->obj), "elm.text", ""); + } + evas_object_move(group->obj, xx - px + ax + ox - ww/2, yy - py + ay + oy - hh/2); - if ((!wd->paused_markers) || (group->update_resize)) - { - group->update_resize = EINA_FALSE; - evas_object_resize(group->obj, ww, hh); - } - if (group->update_raise) - { - group->update_raise = EINA_FALSE; - evas_object_raise(group->obj); - evas_object_show(group->obj); - } - if (group->bubble) _group_bubble_place(group); - } - else if (group->obj) - { - _group_object_free(group); - } - } - } + if ((!wd->paused_markers) || (group->update_resize)) + { + group->update_resize = EINA_FALSE; + evas_object_resize(group->obj, ww, hh); + } + if (group->update_raise) + { + group->update_raise = EINA_FALSE; + evas_object_raise(group->obj); + evas_object_show(group->obj); + } + if (group->bubble) _group_bubble_place(group); + } + else if (group->obj) + { + _group_object_free(group); + } + } + } } } @@ -644,7 +644,7 @@ int xx, yy, ww, hh; if (!wd) return; - + ax = 0; ay = 0; gw = wd->size.w; @@ -657,36 +657,36 @@ EINA_ITERATOR_FOREACH(it, cell) { - Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); + Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); - xx = gi->out.x; - yy = gi->out.y; - ww = gi->out.w; - hh = gi->out.h; - if ((gw != g->w) && (g->w > 0)) - { - tx = xx; - xx = ((long long )gw * xx) / g->w; - ww = (((long long)gw * (tx + ww)) / g->w) - xx; - } - if ((gh != g->h) && (g->h > 0)) - { - ty = yy; - yy = ((long long)gh * yy) / g->h; - hh = (((long long)gh * (ty + hh)) / g->h) - yy; - } - evas_object_move(gi->img, + xx = gi->out.x; + yy = gi->out.y; + ww = gi->out.w; + hh = gi->out.h; + if ((gw != g->w) && (g->w > 0)) + { + tx = xx; + xx = ((long long )gw * xx) / g->w; + ww = (((long long)gw * (tx + ww)) / g->w) - xx; + } + if ((gh != g->h) && (g->h > 0)) + { + ty = yy; + yy = ((long long)gh * yy) / g->h; + hh = (((long long)gh * (ty + hh)) / g->h) - yy; + } + evas_object_move(gi->img, xx - px + ax + ox, yy - py + ay + oy); - - evas_object_resize(gi->img, ww, hh); - /*evas_object_move(gi->txt, - xx - px + ax + ox, - yy - py + ay + oy); + evas_object_resize(gi->img, ww, hh); - evas_object_resize(gi->txt, ww, hh); - */ + /*evas_object_move(gi->txt, + xx - px + ax + ox, + yy - py + ay + oy); + + evas_object_resize(gi->txt, ww, hh); + */ } eina_iterator_free(it); } @@ -708,34 +708,34 @@ EINA_ITERATOR_FOREACH(it, cell) { - Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); - evas_object_del(gi->img); - //evas_object_del(gi->txt); + Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); + evas_object_del(gi->img); + //evas_object_del(gi->txt); - if (gi->want) - { - gi->want = EINA_FALSE; - wd->preload_num--; - if (!wd->preload_num) - { - edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), - "elm,state,busy,stop", "elm"); - evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL, NULL); - } - } + if (gi->want) + { + gi->want = EINA_FALSE; + wd->preload_num--; + if (!wd->preload_num) + { + edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), + "elm,state,busy,stop", "elm"); + evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL, NULL); + } + } - if (gi->job) - { - DBG("DOWNLOAD abort %s", gi->file); - ecore_file_download_abort(gi->job); - ecore_file_remove(gi->file); - gi->job = NULL; - wd->try_num--; - } - if (gi->file) - eina_stringshare_del(gi->file); - - free(gi); + if (gi->job) + { + DBG("DOWNLOAD abort %s", gi->file); + ecore_file_download_abort(gi->job); + ecore_file_remove(gi->file); + gi->job = NULL; + wd->try_num--; + } + if (gi->file) + eina_stringshare_del(gi->file); + + free(gi); } eina_matrixsparse_free(g->grid); eina_iterator_free(it); @@ -752,7 +752,7 @@ evas_object_image_file_set(gi->img, gi->file, NULL); if (evas_object_image_load_error_get(gi->img) != EVAS_LOAD_ERROR_NONE) ecore_file_remove(gi->file); - + evas_object_show(gi->img); //evas_object_text_text_set(gi->txt, gi->file); @@ -762,9 +762,9 @@ gi->wd->preload_num--; if (!gi->wd->preload_num) { - edje_object_signal_emit(elm_smart_scroller_edje_object_get(gi->wd->scr), + edje_object_signal_emit(elm_smart_scroller_edje_object_get(gi->wd->scr), "elm,state,busy,stop", "elm"); - evas_object_smart_callback_call(gi->wd->obj, SIG_LOADED_DETAIL, NULL); + evas_object_smart_callback_call(gi->wd->obj, SIG_LOADED_DETAIL, NULL); } } @@ -782,8 +782,8 @@ if (status) { - DBG("Download failed %s (%d) ", gi->file, status); - ecore_file_remove(gi->file); + DBG("Download failed %s (%d) ", gi->file, status); + ecore_file_remove(gi->file); } else gi->wd->finish_num++; @@ -832,7 +832,7 @@ if (!wd) return; evas_object_geometry_get(wd->pan_smart, &ox, &oy, &ow, &oh); evas_output_viewport_get(evas_object_evas_get(wd->obj), &cvx, &cvy, &cvw, &cvh); - + gw = wd->size.w; gh = wd->size.h; @@ -844,71 +844,71 @@ if (size < (g->tsize / 2)) return; // else we will load to much tiles it = eina_matrixsparse_iterator_new(g->grid); - + EINA_ITERATOR_FOREACH(it, cell) { - gi = eina_matrixsparse_cell_data_get(cell); + gi = eina_matrixsparse_cell_data_get(cell); - xx = gi->out.x; - yy = gi->out.y; - ww = gi->out.w; - hh = gi->out.h; + xx = gi->out.x; + yy = gi->out.y; + ww = gi->out.w; + hh = gi->out.h; - if ((gw != g->w) && (g->w > 0)) - { - tx = xx; - xx = ((long long )gw * xx) / g->w; - ww = (((long long)gw * (tx + ww)) / g->w) - xx; - } - if ((gh != g->h) && (g->h > 0)) - { - ty = yy; - yy = ((long long)gh * yy) / g->h; - hh = (((long long)gh * (ty + hh)) / g->h) - yy; - } + if ((gw != g->w) && (g->w > 0)) + { + tx = xx; + xx = ((long long )gw * xx) / g->w; + ww = (((long long)gw * (tx + ww)) / g->w) - xx; + } + if ((gh != g->h) && (g->h > 0)) + { + ty = yy; + yy = ((long long)gh * yy) / g->h; + hh = (((long long)gh * (ty + hh)) / g->h) - yy; + } - if (!ELM_RECTS_INTERSECT(xx - wd->pan_x + ox, + if (!ELM_RECTS_INTERSECT(xx - wd->pan_x + ox, yy - wd->pan_y + oy, ww, hh, cvx, cvy, cvw, cvh)) - { - if (gi->want) - { - evas_object_hide(gi->img); - //evas_object_hide(gi->txt); - evas_object_image_file_set(gi->img, NULL, NULL); - gi->want = EINA_FALSE; - gi->have = EINA_FALSE; - - if (gi->job) - { - DBG("DOWNLOAD abort %s", gi->file); - ecore_file_download_abort(gi->job); - ecore_file_remove(gi->file); - gi->job = NULL; + { + if (gi->want) + { + evas_object_hide(gi->img); + //evas_object_hide(gi->txt); + evas_object_image_file_set(gi->img, NULL, NULL); + gi->want = EINA_FALSE; + gi->have = EINA_FALSE; + + if (gi->job) + { + DBG("DOWNLOAD abort %s", gi->file); + ecore_file_download_abort(gi->job); + ecore_file_remove(gi->file); + gi->job = NULL; wd->try_num--; - } - gi->download = EINA_FALSE; - wd->preload_num--; - if (!wd->preload_num) - { - edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), + } + gi->download = EINA_FALSE; + wd->preload_num--; + if (!wd->preload_num) + { + edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,state,busy,stop", "elm"); - evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL, - NULL); - } + evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL, + NULL); + } - } - else if (gi->have) - { - evas_object_hide(gi->img); - //evas_object_hide(gi->txt); - evas_object_image_preload(gi->img, 1); - evas_object_image_file_set(gi->img, NULL, NULL); - gi->have = EINA_FALSE; - gi->want = EINA_FALSE; - } - } + } + else if (gi->have) + { + evas_object_hide(gi->img); + //evas_object_hide(gi->txt); + evas_object_image_preload(gi->img, 1); + evas_object_image_file_set(gi->img, NULL, NULL); + gi->have = EINA_FALSE; + gi->want = EINA_FALSE; + } + } } eina_iterator_free(it); @@ -926,97 +926,97 @@ for (y = yy; y <= yy + hh; y++) { - for (x = xx; x <= xx + ww; x++) - { - gi = eina_matrixsparse_data_idx_get(g->grid, y, x); + for (x = xx; x <= xx + ww; x++) + { + gi = eina_matrixsparse_data_idx_get(g->grid, y, x); - if ((!gi) && (g != eina_list_data_get(wd->grids))) - continue; + if ((!gi) && (g != eina_list_data_get(wd->grids))) + continue; - if (!gi) - { - gi = calloc(1, sizeof(Grid_Item)); - gi->src.x = x * g->tsize; - gi->src.y = y * g->tsize; - gi->src.w = g->tsize; - gi->src.h = g->tsize; + if (!gi) + { + gi = calloc(1, sizeof(Grid_Item)); + gi->src.x = x * g->tsize; + gi->src.y = y * g->tsize; + gi->src.w = g->tsize; + gi->src.h = g->tsize; - gi->out.x = gi->src.x; - gi->out.y = gi->src.y; - gi->out.w = gi->src.w; - gi->out.h = gi->src.h; + gi->out.x = gi->src.x; + gi->out.y = gi->src.y; + gi->out.w = gi->src.w; + gi->out.h = gi->src.h; - gi->wd = wd; - - gi->img = evas_object_image_add(evas_object_evas_get(obj)); - evas_object_image_scale_hint_set - (gi->img, EVAS_IMAGE_SCALE_HINT_DYNAMIC); - evas_object_image_filled_set(gi->img, 1); - - evas_object_smart_member_add(gi->img, wd->pan_smart); - elm_widget_sub_object_add(obj, gi->img); - evas_object_pass_events_set(gi->img, EINA_TRUE); - evas_object_stack_below(gi->img, wd->sep_maps_markers); - - /*gi->txt = evas_object_text_add(evas_object_evas_get(obj)); - evas_object_text_font_set(gi->txt, "Vera", 12); - evas_object_color_set(gi->txt, 100, 100, 100, 255); - evas_object_smart_member_add(gi->txt, - wd->pan_smart); - elm_widget_sub_object_add(obj, gi->txt); - evas_object_pass_events_set(gi->txt, EINA_TRUE); + gi->wd = wd; + + gi->img = evas_object_image_add(evas_object_evas_get(obj)); + evas_object_image_scale_hint_set + (gi->img, EVAS_IMAGE_SCALE_HINT_DYNAMIC); + evas_object_image_filled_set(gi->img, 1); + + evas_object_smart_member_add(gi->img, wd->pan_smart); + elm_widget_sub_object_add(obj, gi->img); + evas_object_pass_events_set(gi->img, EINA_TRUE); + evas_object_stack_below(gi->img, wd->sep_maps_markers); + + /*gi->txt = evas_object_text_add(evas_object_evas_get(obj)); + evas_object_text_font_set(gi->txt, "Vera", 12); + evas_object_color_set(gi->txt, 100, 100, 100, 255); + evas_object_smart_member_add(gi->txt, + wd->pan_smart); + elm_widget_sub_object_add(obj, gi->txt); + evas_object_pass_events_set(gi->txt, EINA_TRUE); */ - eina_matrixsparse_data_idx_set(g->grid, y, x, gi); - } - - if ((!gi->have) && (!gi->download)) - { - char buf[PATH_MAX], buf2[PATH_MAX]; - char *source; - - gi->want = EINA_TRUE; - - snprintf(buf, sizeof(buf), DEST_DIR_PATH, wd->id, g->zoom, x); - if (!ecore_file_exists(buf)) - ecore_file_mkpath(buf); - - snprintf(buf2, sizeof(buf2), DEST_FILE_PATH, buf, y); - - source = map_sources_tab[wd->source].url_cb(obj, x, y, g->zoom); - if ((!source) || (strlen(source)==0)) continue; - - eina_stringshare_replace(&gi->file, buf2); + eina_matrixsparse_data_idx_set(g->grid, y, x, gi); + } - if ((ecore_file_exists(buf2)) || (g == eina_list_data_get(wd->grids))) - { - gi->download = EINA_TRUE; - wd->preload_num++; - if (wd->preload_num == 1) - { - edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), + if ((!gi->have) && (!gi->download)) + { + char buf[PATH_MAX], buf2[PATH_MAX]; + char *source; + + gi->want = EINA_TRUE; + + snprintf(buf, sizeof(buf), DEST_DIR_PATH, wd->id, g->zoom, x); + if (!ecore_file_exists(buf)) + ecore_file_mkpath(buf); + + snprintf(buf2, sizeof(buf2), DEST_FILE_PATH, buf, y); + + source = map_sources_tab[wd->source].url_cb(obj, x, y, g->zoom); + if ((!source) || (strlen(source)==0)) continue; + + eina_stringshare_replace(&gi->file, buf2); + + if ((ecore_file_exists(buf2)) || (g == eina_list_data_get(wd->grids))) + { + gi->download = EINA_TRUE; + wd->preload_num++; + if (wd->preload_num == 1) + { + edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), "elm,state,busy,start", "elm"); - evas_object_smart_callback_call(obj, - SIG_LOAD_DETAIL, - NULL); - } - - if (ecore_file_exists(buf2)) - _tile_update(gi); - else - { - DBG("DOWNLOAD %s \t in %s", source, buf2); - ecore_file_download_full(source, buf2, _tile_downloaded, NULL, gi, &(gi->job), wd->ua); + evas_object_smart_callback_call(obj, + SIG_LOAD_DETAIL, + NULL); + } + + if (ecore_file_exists(buf2)) + _tile_update(gi); + else + { + DBG("DOWNLOAD %s \t in %s", source, buf2); + ecore_file_download_full(source, buf2, _tile_downloaded, NULL, gi, &(gi->job), wd->ua); if (!gi->job) DBG("Can't start to download %s", buf); else wd->try_num++; - } - } - if (source) free(source); - } - else if (gi->have) - evas_object_show(gi->img); - } + } + } + if (source) free(source); + } + else if (gi->have) + evas_object_show(gi->img); + } } } @@ -1029,8 +1029,8 @@ if (!wd) return; EINA_LIST_FREE(wd->grids, g) { - grid_clear(obj, g); - free(g); + grid_clear(obj, g); + free(g); } } @@ -1044,15 +1044,15 @@ if (!wd) return; EINA_LIST_FOREACH(wd->grids, l, g) { - Eina_Iterator *it = eina_matrixsparse_iterator_new(g->grid); - Eina_Matrixsparse_Cell *cell; - - EINA_ITERATOR_FOREACH(it, cell) - { - Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); - evas_object_image_smooth_scale_set(gi->img, (!wd->nosmooth)); - } - eina_iterator_free(it); + Eina_Iterator *it = eina_matrixsparse_iterator_new(g->grid); + Eina_Matrixsparse_Cell *cell; + + EINA_ITERATOR_FOREACH(it, cell) + { + Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); + evas_object_image_smooth_scale_set(gi->img, (!wd->nosmooth)); + } + eina_iterator_free(it); } } @@ -1067,9 +1067,9 @@ EINA_ITERATOR_FOREACH(it, cell) { - Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); - evas_object_raise(gi->img); - //evas_object_raise(gi->txt); + Grid_Item *gi = eina_matrixsparse_cell_data_get(cell); + evas_object_raise(gi->img); + //evas_object_raise(gi->txt); } eina_iterator_free(it); } @@ -1092,8 +1092,8 @@ if (!wd) return; if (!wd->scr_timer) { - wd->nosmooth++; - if (wd->nosmooth == 1) _smooth_update(data); + wd->nosmooth++; + if (wd->nosmooth == 1) _smooth_update(data); } if (wd->scr_timer) ecore_timer_del(wd->scr_timer); wd->scr_timer = ecore_timer_add(0.5, _scr_timeout, data); @@ -1115,14 +1115,14 @@ if (wd->center_on.enabled) { - elm_map_utils_convert_geo_into_coord(obj, wd->center_on.lon, wd->center_on.lat, wd->size.w, &xx, &yy); - xx -= ow / 2; - yy -= oh / 2; + elm_map_utils_convert_geo_into_coord(obj, wd->center_on.lon, wd->center_on.lat, wd->size.w, &xx, &yy); + xx -= ow / 2; + yy -= oh / 2; } else { - xx = (wd->size.spos.x * wd->size.w) - (ow / 2); - yy = (wd->size.spos.y * wd->size.h) - (oh / 2); + xx = (wd->size.spos.x * wd->size.w) - (ow / 2); + yy = (wd->size.spos.y * wd->size.h) - (oh / 2); } if (xx < 0) xx = 0; @@ -1140,7 +1140,7 @@ wd->calc_job = ecore_job_add(_calc_job, wd); if (t >= 1.0) { - return ECORE_CALLBACK_CANCEL; + return ECORE_CALLBACK_CANCEL; } return ECORE_CALLBACK_RENEW; } @@ -1166,10 +1166,10 @@ go = zoom_do(obj, t); if (!go) { - wd->nosmooth--; - if (!wd->nosmooth) _smooth_update(data); - wd->zoom_animator = NULL; - evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); + wd->nosmooth--; + if (!wd->nosmooth) _smooth_update(data); + wd->zoom_animator = NULL; + evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL); } return go; } @@ -1191,7 +1191,7 @@ Widget_Data *wd = elm_widget_data_get(data); Evas_Event_Mouse_Down *ev = event_info; Event *ev0; - + ev0 = get_event_object(data, 0); if (ev0) return; ev0 = create_event_object(data, obj, 0); @@ -1206,9 +1206,9 @@ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE; else wd->on_hold = EINA_FALSE; if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) - evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, ev); + evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, ev); else - evas_object_smart_callback_call(data, SIG_PRESS, ev); + evas_object_smart_callback_call(data, SIG_PRESS, ev); wd->longpressed = EINA_FALSE; if (wd->long_timer) ecore_timer_del(wd->long_timer); wd->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data); @@ -1220,7 +1220,7 @@ Widget_Data *wd = elm_widget_data_get(data); Evas_Event_Mouse_Move *move = event_info; Event *ev0; - + if (wd->pinch_zoom) return; ev0 = get_event_object(data, 0); if (!ev0) return; @@ -1236,7 +1236,7 @@ int mdevice; Event *ev0; Event *ev1; - + ev0 = get_event_object(data, 0); if (ev0) { @@ -1255,8 +1255,8 @@ else { ev1 = get_event_object(data, mdevice); - if (ev1) - ev1->hold_timer = ecore_timer_add(0.35, _hold_timer_cb, ev1); + if (ev1) + ev1->hold_timer = ecore_timer_add(0.35, _hold_timer_cb, ev1); } destroy_event_object(data, ev0); } @@ -1267,8 +1267,8 @@ else wd->on_hold = EINA_FALSE; if (wd->long_timer) { - ecore_timer_del(wd->long_timer); - wd->long_timer = NULL; + ecore_timer_del(wd->long_timer); + wd->long_timer = NULL; } if (!wd->on_hold) evas_object_smart_callback_call(data, SIG_CLICKED, ev); wd->on_hold = EINA_FALSE; @@ -1325,10 +1325,10 @@ dis_new = get_distance(ev0->prev.x, ev0->prev.y, ev->prev.x, ev->prev.y); zoom = wd->zoom; - + if (dis_old) { - if (((dis_old - dis_new) > 0) && + if (((dis_old - dis_new) > 0) && (ev->pinch_dis > elm_finger_size_get())) { wd->pinch_zoom = EINA_TRUE; @@ -1336,7 +1336,7 @@ elm_map_zoom_set(data, zoom); ev->pinch_dis = 0; } - else if (((dis_old - dis_new) < 0) && + else if (((dis_old - dis_new) < 0) && (ev->pinch_dis < -elm_finger_size_get())) { wd->pinch_zoom = EINA_TRUE; @@ -1363,17 +1363,17 @@ return; } dis_old = 0; - + ev0 = get_event_object(data, 0); if (ev0) - ev0->hold_timer = ecore_timer_add(0.35, _hold_timer_cb, ev0); + ev0->hold_timer = ecore_timer_add(0.35, _hold_timer_cb, ev0); else { if (ev->hold_timer) { ecore_timer_del(ev->hold_timer); ev->hold_timer = NULL; - } + } } destroy_event_object(data, ev); } @@ -1384,12 +1384,12 @@ _hold_timer_cb(void *data) { Event *ev0 = data; - + ev0->hold_timer = NULL; return ECORE_CALLBACK_CANCEL; } -static void +static void _rect_resize_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); @@ -1414,16 +1414,16 @@ EINA_LIST_FREE(wd->groups_clas, group_clas) { - if (group_clas->style) - eina_stringshare_del(group_clas->style); - free(group_clas); + if (group_clas->style) + eina_stringshare_del(group_clas->style); + free(group_clas); } EINA_LIST_FREE(wd->markers_clas, marker_clas) { - if (marker_clas->style) - eina_stringshare_del(marker_clas->style); - free(marker_clas); + if (marker_clas->style) + eina_stringshare_del(marker_clas->style); + free(marker_clas); } EINA_LIST_FOREACH(wd->s_event_list, l, ev) @@ -1456,27 +1456,27 @@ if (!wd) return; for (i = 0; i < ZOOM_MAX + 1; i++) { - if (!wd->markers[i]) continue; - Eina_Iterator *it = eina_matrixsparse_iterator_new(wd->markers[i]); - Eina_Matrixsparse_Cell *cell; - - EINA_ITERATOR_FOREACH(it, cell) - { - l = eina_matrixsparse_cell_data_get(cell); - EINA_LIST_FREE(l, group) - { - EINA_LIST_FREE(group->markers, marker) - { - evas_object_event_callback_del_full(group->sc, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + if (!wd->markers[i]) continue; + Eina_Iterator *it = eina_matrixsparse_iterator_new(wd->markers[i]); + Eina_Matrixsparse_Cell *cell; + + EINA_ITERATOR_FOREACH(it, cell) + { + l = eina_matrixsparse_cell_data_get(cell); + EINA_LIST_FREE(l, group) + { + EINA_LIST_FREE(group->markers, marker) + { + evas_object_event_callback_del_full(group->sc, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _bubble_sc_hits_changed_cb, group); - if (free_marker) free(marker); - } - free(group); - } - free_marker = EINA_FALSE; - } - eina_iterator_free(it); - eina_matrixsparse_free(wd->markers[i]); + if (free_marker) free(marker); + } + free(group); + } + free_marker = EINA_FALSE; + } + eina_iterator_free(it); + eina_matrixsparse_free(wd->markers[i]); } evas_object_del(wd->sep_maps_markers); @@ -1491,13 +1491,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->obj, "elm,action,focus", "elm"); - evas_object_focus_set(wd->obj, EINA_TRUE); + edje_object_signal_emit(wd->obj, "elm,action,focus", "elm"); + evas_object_focus_set(wd->obj, EINA_TRUE); } else { - edje_object_signal_emit(wd->obj, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->obj, EINA_FALSE); + edje_object_signal_emit(wd->obj, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->obj, EINA_FALSE); } } @@ -1507,7 +1507,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; elm_smart_scroller_object_theme_set(obj, wd->scr, "map", "base", elm_widget_style_get(obj)); -// 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); _sizing_eval(obj); } @@ -1532,20 +1532,20 @@ minh = wd->size.h; if (wd->resized) { - wd->resized = 0; - if (wd->mode != ELM_MAP_ZOOM_MODE_MANUAL) - { - double tz = wd->zoom; - wd->zoom = 0.0; - elm_map_zoom_set(wd->obj, tz); - } + wd->resized = 0; + if (wd->mode != ELM_MAP_ZOOM_MODE_MANUAL) + { + double tz = wd->zoom; + wd->zoom = 0.0; + elm_map_zoom_set(wd->obj, tz); + } } if ((minw != wd->minw) || (minh != wd->minh)) { - wd->minw = minw; - wd->minh = minh; - evas_object_smart_callback_call(wd->pan_smart, SIG_CHANGED, NULL); - _sizing_eval(wd->obj); + wd->minw = minw; + wd->minh = minh; + evas_object_smart_callback_call(wd->pan_smart, SIG_CHANGED, NULL); + _sizing_eval(wd->obj); } wd->calc_job = NULL; evas_object_smart_changed(wd->pan_smart); @@ -1650,9 +1650,9 @@ rect_place(sd->wd->obj, sd->wd->pan_x, sd->wd->pan_y, ox, oy, ow, oh); EINA_LIST_FOREACH(sd->wd->grids, l, g) { - grid_load(sd->wd->obj, g); - grid_place(sd->wd->obj, g, sd->wd->pan_x, sd->wd->pan_y, ox, oy, ow, oh); - marker_place(sd->wd->obj, g, sd->wd->pan_x, sd->wd->pan_y, ox, oy, ow, oh); + grid_load(sd->wd->obj, g); + grid_place(sd->wd->obj, g, sd->wd->pan_x, sd->wd->pan_y, ox, oy, ow, oh); + marker_place(sd->wd->obj, g, sd->wd->pan_x, sd->wd->pan_y, ox, oy, ow, oh); } } @@ -1739,49 +1739,49 @@ if (group->obj) return; if ((!group->clas->priv.objs_notused) || (eina_list_count(group->markers) == 1)) { - //set icon and style - if (eina_list_count(group->markers) == 1) - { - Elm_Map_Marker *m = eina_list_data_get(group->markers); - if (m->clas->style) - style = m->clas->style; - - if (m->clas->func.icon_get) - icon = m->clas->func.icon_get(group->wd->obj, m, m->data); - - group->delete_object = EINA_TRUE; - } - else - { - if (group->clas->style) - style = group->clas->style; - - if (group->clas->func.icon_get) - icon = group->clas->func.icon_get(group->wd->obj, group->clas->data); - - group->delete_object = EINA_FALSE; - } - - group->obj = elm_layout_add(group->wd->obj); - elm_layout_theme_set(group->obj, "map/marker", style, elm_widget_style_get(group->wd->obj)); + //set icon and style + if (eina_list_count(group->markers) == 1) + { + Elm_Map_Marker *m = eina_list_data_get(group->markers); + if (m->clas->style) + style = m->clas->style; - if (icon) elm_layout_content_set(group->obj, "elm.icon", icon); - - evas_object_smart_member_add(group->obj, group->wd->pan_smart); - elm_widget_sub_object_add(group->wd->obj, group->obj); - evas_object_stack_above(group->obj, group->wd->sep_maps_markers); + if (m->clas->func.icon_get) + icon = m->clas->func.icon_get(group->wd->obj, m, m->data); - if (!group->delete_object) - group->clas->priv.objs_used = eina_list_append(group->clas->priv.objs_used, group->obj); + group->delete_object = EINA_TRUE; + } + else + { + if (group->clas->style) + style = group->clas->style; + + if (group->clas->func.icon_get) + icon = group->clas->func.icon_get(group->wd->obj, group->clas->data); + + group->delete_object = EINA_FALSE; + } + + group->obj = elm_layout_add(group->wd->obj); + elm_layout_theme_set(group->obj, "map/marker", style, elm_widget_style_get(group->wd->obj)); + + if (icon) elm_layout_content_set(group->obj, "elm.icon", icon); + + evas_object_smart_member_add(group->obj, group->wd->pan_smart); + elm_widget_sub_object_add(group->wd->obj, group->obj); + evas_object_stack_above(group->obj, group->wd->sep_maps_markers); + + if (!group->delete_object) + group->clas->priv.objs_used = eina_list_append(group->clas->priv.objs_used, group->obj); } else { - group->delete_object = EINA_FALSE; - - group->obj = eina_list_data_get(group->clas->priv.objs_notused); - group->clas->priv.objs_used = eina_list_append(group->clas->priv.objs_used, group->obj); - group->clas->priv.objs_notused = eina_list_remove(group->clas->priv.objs_notused, group->obj); - evas_object_show(group->obj); + group->delete_object = EINA_FALSE; + + group->obj = eina_list_data_get(group->clas->priv.objs_notused); + group->clas->priv.objs_used = eina_list_append(group->clas->priv.objs_used, group->obj); + group->clas->priv.objs_notused = eina_list_remove(group->clas->priv.objs_notused, group->obj); + evas_object_show(gr... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2011-04-01 11:32:42
|
Log: elementary - entry, genlist, gengrid, image, icon, hover, frame, diskselector, index, layout, label, conform, flip, flipselector - removed white spaces Author: hermet Date: 2011-04-01 04:32:33 -0700 (Fri, 01 Apr 2011) New Revision: 58252 Trac: http://trac.enlightenment.org/e/changeset/58252 Modified: trunk/elementary/src/lib/elm_conform.c trunk/elementary/src/lib/elm_diskselector.c trunk/elementary/src/lib/elm_entry.c trunk/elementary/src/lib/elm_flip.c trunk/elementary/src/lib/elm_flipselector.c trunk/elementary/src/lib/elm_frame.c trunk/elementary/src/lib/elm_gengrid.c trunk/elementary/src/lib/elm_genlist.c trunk/elementary/src/lib/elm_hover.c trunk/elementary/src/lib/elm_icon.c trunk/elementary/src/lib/elm_image.c trunk/elementary/src/lib/elm_index.c trunk/elementary/src/lib/elm_label.c trunk/elementary/src/lib/elm_layout.c Modified: trunk/elementary/src/lib/elm_conform.c =================================================================== --- trunk/elementary/src/lib/elm_conform.c 2011-04-01 11:26:58 UTC (rev 58251) +++ trunk/elementary/src/lib/elm_conform.c 2011-04-01 11:32:33 UTC (rev 58252) @@ -3,24 +3,24 @@ /** * @defgroup Conformant Conformant - * - * The aim is to provide a widget that can be used in elementary apps to - * account for space taken up by the indicator & softkey windows when running + * + * The aim is to provide a widget that can be used in elementary apps to + * account for space taken up by the indicator & softkey windows when running * the illume2 module of E17. */ typedef struct _Widget_Data Widget_Data; -struct _Widget_Data +struct _Widget_Data { Evas_Object *base; Evas_Object *shelf, *panel; Evas_Object *content; Ecore_Event_Handler *prop_hdl; struct { - Ecore_Animator *animator; // animaton timer - double start; // time started - Evas_Coord auto_x, auto_y; // desired delta - Evas_Coord x, y; // current delta + Ecore_Animator *animator; // animaton timer + double start; // time started + Evas_Coord auto_x, auto_y; // desired delta + Evas_Coord x, y; // current delta } delta; }; @@ -33,8 +33,8 @@ static Eina_Bool _prop_change(void *data, int type, void *event); /* local functions */ -static void -_del_hook(Evas_Object *obj) +static void +_del_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -42,7 +42,7 @@ free(wd); } -static void +static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl) { Widget_Data *wd = elm_widget_data_get(obj); @@ -50,8 +50,8 @@ edje_object_mirrored_set(wd->base, rtl); } -static void -_theme_hook(Evas_Object *obj) +static void +_theme_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -64,8 +64,8 @@ _sizing_eval(obj); } -static void -_sizing_eval(Evas_Object *obj) +static void +_sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord mw = -1, mh = -1; @@ -102,63 +102,63 @@ * visible when the vkbd comes and goes by moving the conformant obj (and thus * its children) to show the focused widget (and if focus changes follow) -static Evas_Object * -_focus_object_get(const Evas_Object *obj) -{ - Evas_Object *win, *foc; - - win = elm_widget_top_get(obj); - if (!win) return NULL; - foc = elm_widget_top_get(win); -} + static Evas_Object * + _focus_object_get(const Evas_Object *obj) + { + Evas_Object *win, *foc; -static void -_focus_object_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) -{ - evas_object_geometry_get(obj, x, y, w, h); -} + win = elm_widget_top_get(obj); + if (!win) return NULL; + foc = elm_widget_top_get(win); + } -static void -_focus_change_del(void *data, Evas_Object *obj, void *event_info) -{ - // called from toplevel when the focused window shanges + static void + _focus_object_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) + { + evas_object_geometry_get(obj, x, y, w, h); + } + + static void + _focus_change_del(void *data, Evas_Object *obj, void *event_info) + { +// called from toplevel when the focused window shanges } static void _autoscroll_move(Evas_Object *obj) { - // move conformant edje by delta to show focused widget +// move conformant edje by delta to show focused widget } static void _autoscroll_mode_enable(Evas_Object *obj) { - // called when autoscroll mode should be on - content area smaller than - // its min size - // 1. get focused object - // 2. if not in visible conformant area calculate delta needed to - // get it in - // 3. store delta and call _autoscroll_move() which either asanimates - // or jumps right there +// called when autoscroll mode should be on - content area smaller than +// its min size +// 1. get focused object +// 2. if not in visible conformant area calculate delta needed to +// get it in +// 3. store delta and call _autoscroll_move() which either asanimates +// or jumps right there } static void _autoscroll_mode_disable(Evas_Object *obj) { - // called when autoscroll mode should be off - set delta to 0 and - // call _autoscroll_move() +// called when autoscroll mode should be off - set delta to 0 and +// call _autoscroll_move() } -*/ + */ static Eina_Bool -_prop_change(void *data, int type __UNUSED__, void *event) +_prop_change(void *data, int type __UNUSED__, void *event) { #ifdef HAVE_ELEMENTARY_X Ecore_X_Event_Window_Property *ev; Widget_Data *wd = elm_widget_data_get(data); if (!wd) return ECORE_CALLBACK_PASS_ON; ev = event; - if (ev->atom == ECORE_X_ATOM_E_ILLUME_ZONE) + if (ev->atom == ECORE_X_ATOM_E_ILLUME_ZONE) { Ecore_X_Window zone; int sh = -1; @@ -174,7 +174,7 @@ evas_object_size_hint_min_set(wd->panel, -1, sh); evas_object_size_hint_max_set(wd->panel, -1, sh); } - else if (ev->atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY) + else if (ev->atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY) { Ecore_X_Window zone; int sh = -1; @@ -185,7 +185,7 @@ evas_object_size_hint_min_set(wd->shelf, -1, sh); evas_object_size_hint_max_set(wd->shelf, -1, sh); } - else if (ev->atom == ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY) + else if (ev->atom == ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY) { Ecore_X_Window zone; int sh = -1; @@ -196,7 +196,7 @@ evas_object_size_hint_min_set(wd->panel, -1, sh); evas_object_size_hint_max_set(wd->panel, -1, sh); } - else if (ev->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY) + else if (ev->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY) { Ecore_X_Window zone; int ky = -1; @@ -213,21 +213,21 @@ /** * Add a new Conformant object - * + * * @param parent The parent object * @return The new conformant object or NULL if it cannot be created - * + * * @ingroup Conformant */ EAPI Evas_Object * -elm_conformant_add(Evas_Object *parent) +elm_conformant_add(Evas_Object *parent) { Evas_Object *obj; Evas *e; Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "conformant"); elm_widget_type_set(obj, "conformant"); elm_widget_sub_object_add(parent, obj); @@ -264,7 +264,7 @@ evas_object_size_hint_max_set(wd->panel, -1, sh); edje_object_part_swallow(wd->base, "elm.swallow.panel", wd->panel); - wd->prop_hdl = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, + wd->prop_hdl = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, _prop_change, obj); // FIXME: get kbd region prop #endif @@ -299,10 +299,10 @@ wd->content = content; if (content) { - elm_widget_sub_object_add(obj, content); - evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->base, "elm.swallow.content", content); + elm_widget_sub_object_add(obj, content); + evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->base, "elm.swallow.content", content); } _sizing_eval(obj); } Modified: trunk/elementary/src/lib/elm_diskselector.c =================================================================== --- trunk/elementary/src/lib/elm_diskselector.c 2011-04-01 11:26:58 UTC (rev 58251) +++ trunk/elementary/src/lib/elm_diskselector.c 2011-04-01 11:32:33 UTC (rev 58252) @@ -53,7 +53,7 @@ static const char *widtype = NULL; -#define ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, ...) \ +#define ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, ...) \ ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \ ELM_CHECK_WIDTYPE(it->base.widget, widtype) __VA_ARGS__; @@ -124,7 +124,7 @@ evas_object_show(it->base.view); if (it->label) - edje_object_part_text_set(it->base.view, "elm.text", it->label); + edje_object_part_text_set(it->base.view, "elm.text", it->label); if (it->icon) { evas_object_size_hint_min_set(it->icon, 24, 24); @@ -287,13 +287,13 @@ if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->self, "elm,action,focus", "elm"); - evas_object_focus_set(wd->self, EINA_TRUE); + edje_object_signal_emit(wd->self, "elm,action,focus", "elm"); + evas_object_focus_set(wd->self, EINA_TRUE); } else { - edje_object_signal_emit(wd->self, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->self, EINA_FALSE); + edje_object_signal_emit(wd->self, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->self, EINA_FALSE); } } @@ -398,11 +398,11 @@ len = eina_stringshare_strlen(it->label); if (x <= ox + 5) - edje_object_signal_emit(it->base.view, "elm,state,left_side", - "elm"); + edje_object_signal_emit(it->base.view, "elm,state,left_side", + "elm"); else if (x + w >= ox + ow - 5) - edje_object_signal_emit(it->base.view, "elm,state,right_side", - "elm"); + edje_object_signal_emit(it->base.view, "elm,state,right_side", + "elm"); else { if ((wd->len_threshold) && (len > wd->len_threshold)) @@ -626,7 +626,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "diskselector"); elm_widget_type_set(obj, "diskselector"); elm_widget_sub_object_add(parent, obj); @@ -649,7 +649,7 @@ _theme_hook(obj); elm_widget_resize_object_set(obj, wd->scroller); elm_smart_scroller_policy_set(wd->scroller, ELM_SMART_SCROLLER_POLICY_OFF, - ELM_SMART_SCROLLER_POLICY_OFF); + ELM_SMART_SCROLLER_POLICY_OFF); elm_smart_scroller_bounce_allow_set(wd->scroller, EINA_TRUE, EINA_FALSE); evas_object_smart_callback_add(wd->scroller, "scroll", _scroller_move_cb, wd); Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-04-01 11:26:58 UTC (rev 58251) +++ trunk/elementary/src/lib/elm_entry.c 2011-04-01 11:32:33 UTC (rev 58252) @@ -201,23 +201,23 @@ static const char SIG_CURSOR_CHANGED[] = "cursor,changed"; static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CHANGED, ""}, - {SIG_ACTIVATED, ""}, - {SIG_PRESS, ""}, - {SIG_LONGPRESSED, ""}, - {SIG_CLICKED, ""}, - {SIG_CLICKED_DOUBLE, ""}, - {SIG_FOCUSED, ""}, - {SIG_UNFOCUSED, ""}, - {SIG_SELECTION_PASTE, ""}, - {SIG_SELECTION_COPY, ""}, - {SIG_SELECTION_CUT, ""}, - {SIG_SELECTION_START, ""}, - {SIG_SELECTION_CHANGED, ""}, - {SIG_SELECTION_CLEARED, ""}, - {SIG_CURSOR_CHANGED, ""}, - {SIG_ANCHOR_CLICKED, ""}, - {NULL, NULL} + {SIG_CHANGED, ""}, + {SIG_ACTIVATED, ""}, + {SIG_PRESS, ""}, + {SIG_LONGPRESSED, ""}, + {SIG_CLICKED, ""}, + {SIG_CLICKED_DOUBLE, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, + {SIG_SELECTION_PASTE, ""}, + {SIG_SELECTION_COPY, ""}, + {SIG_SELECTION_CUT, ""}, + {SIG_SELECTION_START, ""}, + {SIG_SELECTION_CHANGED, ""}, + {SIG_SELECTION_CLEARED, ""}, + {SIG_CURSOR_CHANGED, ""}, + {SIG_ANCHOR_CLICKED, ""}, + {NULL, NULL} }; static Eina_List *entries = NULL; @@ -239,12 +239,12 @@ m->api = malloc(sizeof(Mod_Api)); if (!m->api) return NULL; ((Mod_Api *)(m->api) )->obj_hook = // called on creation - _elm_module_symbol_get(m, "obj_hook"); + _elm_module_symbol_get(m, "obj_hook"); ((Mod_Api *)(m->api) )->obj_unhook = // called on deletion - _elm_module_symbol_get(m, "obj_unhook"); + _elm_module_symbol_get(m, "obj_unhook"); ((Mod_Api *)(m->api) )->obj_longpress = // called on long press menu - _elm_module_symbol_get(m, "obj_longpress"); - ok: // ok - return api + _elm_module_symbol_get(m, "obj_longpress"); +ok: // ok - return api return m->api; } @@ -437,17 +437,17 @@ return NULL; } if (as->accepted) - as2->accepted = eina_stringshare_add(as->accepted); + as2->accepted = eina_stringshare_add(as->accepted); else - as2->accepted = NULL; + as2->accepted = NULL; if (as->rejected) - as2->rejected = eina_stringshare_add(as->rejected); + as2->rejected = eina_stringshare_add(as->rejected); else - as2->rejected = NULL; + as2->rejected = NULL; tf->data = as2; } else - tf->data = data; + tf->data = data; return tf; } @@ -545,7 +545,7 @@ elm_entry_entry_set(obj, t); eina_stringshare_del(t); if (elm_widget_disabled_get(obj)) - edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm"); + edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm"); elm_entry_cursor_pos_set(obj, wd->cursor_pos); if (elm_widget_focus_get(obj)) edje_object_signal_emit(wd->ent, "elm,action,focus", "elm"); @@ -716,8 +716,8 @@ _sizing_eval(data); } if (wd->hoversel) _hoversel_position(data); -// Evas_Coord ww, hh; -// evas_object_geometry_get(wd->ent, NULL, NULL, &ww, &hh); + // Evas_Coord ww, hh; + // evas_object_geometry_get(wd->ent, NULL, NULL, &ww, &hh); } static void @@ -820,7 +820,7 @@ edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); elm_widget_scroll_hold_pop(data); _store_selection(ELM_SEL_CLIPBOARD, data); -// edje_object_part_text_select_none(wd->ent, "elm.text"); + // edje_object_part_text_select_none(wd->ent, "elm.text"); } static void @@ -863,7 +863,7 @@ else elm_widget_scroll_freeze_push(data); wd->hoversel = elm_hoversel_add(data); context_menu_orientation = edje_object_data_get - (wd->ent, "context_menu_orientation"); + (wd->ent, "context_menu_orientation"); if ((context_menu_orientation) && (!strcmp(context_menu_orientation, "horizontal"))) elm_hoversel_horizontal_set(wd->hoversel, EINA_TRUE); @@ -1327,49 +1327,49 @@ Ecore_X_Event_Selection_Notify *ev = event; if (!wd) return ECORE_CALLBACK_PASS_ON; if ((!wd->selection_asked) && (!wd->drag_selection_asked)) - return ECORE_CALLBACK_PASS_ON; + return ECORE_CALLBACK_PASS_ON; if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) || (ev->selection == ECORE_X_SELECTION_PRIMARY)) { - Ecore_X_Selection_Data_Text *text_data; + Ecore_X_Selection_Data_Text *text_data; - text_data = ev->data; - if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT) - { - if (text_data->text) - { - char *txt = _elm_util_text_to_mkup(text_data->text); + text_data = ev->data; + if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT) + { + if (text_data->text) + { + char *txt = _elm_util_text_to_mkup(text_data->text); - if (txt) - { - elm_entry_entry_insert(data, txt); - free(txt); - } - } - } - wd->selection_asked = EINA_FALSE; + if (txt) + { + elm_entry_entry_insert(data, txt); + free(txt); + } + } + } + wd->selection_asked = EINA_FALSE; } else if (ev->selection == ECORE_X_SELECTION_XDND) { - Ecore_X_Selection_Data_Text *text_data; + Ecore_X_Selection_Data_Text *text_data; - text_data = ev->data; - if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT) - { - if (text_data->text) - { - char *txt = _elm_util_text_to_mkup(text_data->text); + text_data = ev->data; + if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT) + { + if (text_data->text) + { + char *txt = _elm_util_text_to_mkup(text_data->text); - if (txt) - { - /* Massive FIXME: this should be at the drag point */ - elm_entry_entry_insert(data, txt); - free(txt); - } - } - } - wd->drag_selection_asked = EINA_FALSE; + if (txt) + { + /* Massive FIXME: this should be at the drag point */ + elm_entry_entry_insert(data, txt); + free(txt); + } + } + } + wd->drag_selection_asked = EINA_FALSE; ecore_x_dnd_send_finished(); @@ -1380,17 +1380,17 @@ static Eina_Bool _event_selection_clear(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { -/* - Widget_Data *wd = elm_widget_data_get(data); - Ecore_X_Event_Selection_Clear *ev = event; - if (!wd) return ECORE_CALLBACK_PASS_ON; - if (!wd->have_selection) return ECORE_CALLBACK_PASS_ON; - if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) || - (ev->selection == ECORE_X_SELECTION_PRIMARY)) - { - elm_entry_select_none(data); - } - return 1;*/ + /* + Widget_Data *wd = elm_widget_data_get(data); + Ecore_X_Event_Selection_Clear *ev = event; + if (!wd) return ECORE_CALLBACK_PASS_ON; + if (!wd->have_selection) return ECORE_CALLBACK_PASS_ON; + if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) || + (ev->selection == ECORE_X_SELECTION_PRIMARY)) + { + elm_entry_select_none(data); + } + return 1;*/ return ECORE_CALLBACK_PASS_ON; } @@ -1409,7 +1409,7 @@ edje_object_part_text_cursor_copy(wd->ent, "elm.text", EDJE_CURSOR_MAIN,/*->*/EDJE_CURSOR_USER); rv = edje_object_part_text_cursor_coord_set(wd->ent,"elm.text", - EDJE_CURSOR_MAIN,drop->x,drop->y); + EDJE_CURSOR_MAIN,drop->x,drop->y); if (!rv) printf("Warning: Failed to position cursor: paste anyway\n"); elm_entry_entry_insert(obj, drop->data); edje_object_part_text_cursor_copy(wd->ent, "elm.text", @@ -1435,7 +1435,7 @@ if (!strncmp(item, "file://", 7)) { const char *fname = item + 7; - + o = evas_object_image_filled_add(evas_object_evas_get(data)); evas_object_image_file_set(o, fname, NULL); if (evas_object_image_load_error_get(o) == EVAS_LOAD_ERROR_NONE) @@ -1470,7 +1470,7 @@ { tf->func(tf->data, data, text); if (!*text) - break; + break; } } @@ -1490,7 +1490,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "entry"); elm_widget_type_set(obj, "entry"); elm_widget_sub_object_add(parent, obj); @@ -1573,16 +1573,16 @@ top = elm_widget_top_get(obj); if ((top) && (elm_win_xwindow_get(top))) { - wd->sel_notify_handler = - ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, - _event_selection_notify, obj); - wd->sel_clear_handler = - ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, - _event_selection_clear, obj); + wd->sel_notify_handler = + ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, + _event_selection_notify, obj); + wd->sel_clear_handler = + ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, + _event_selection_clear, obj); } elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE, - _drag_drop_cb, NULL); + _drag_drop_cb, NULL); #endif entries = eina_list_prepend(entries, obj); @@ -1728,8 +1728,8 @@ text = edje_object_part_text_get(wd->ent, "elm.text"); if (!text) { - ERR("text=NULL for edje %p, part 'elm.text'", wd->ent); - return NULL; + ERR("text=NULL for edje %p, part 'elm.text'", wd->ent); + return NULL; } eina_stringshare_replace(&wd->text, text); return wd->text; @@ -1762,8 +1762,8 @@ * otherwise it is. */ tb = edje_object_part_object_get(wd->ent, "elm.text"); cur = evas_object_textblock_cursor_new((Evas_Object *) tb); /* This is - actually, ok for the time being, thsese hackish stuff will be removed - once evas 1.0 is out*/ + actually, ok for the time being, thsese hackish stuff will be removed + once evas 1.0 is out*/ evas_textblock_cursor_pos_set(cur, 0); ret = evas_textblock_cursor_char_next(cur); evas_textblock_cursor_free(cur); @@ -1790,8 +1790,8 @@ /** * This inserts text in @p entry where the current cursor position. - * - * This inserts text at the cursor position is as if it was typed + * + * This inserts text at the cursor position is as if it was typed * by the user (note this also allows markup which a user * can't just "type" as it would be converted to escaped text, so this * call can be used to insert things like emoticon items or bold push/pop @@ -1835,7 +1835,7 @@ if (wd->linewrap == wrap) return; wd->linewrap = wrap; if(wd->linewrap) - wd->char_linewrap = EINA_FALSE; + wd->char_linewrap = EINA_FALSE; _theme_hook(obj); } @@ -1860,7 +1860,7 @@ if (wd->char_linewrap == wrap) return; wd->char_linewrap = wrap; if(wd->char_linewrap) - wd->linewrap = EINA_FALSE; + wd->linewrap = EINA_FALSE; _theme_hook(obj); } @@ -1885,9 +1885,9 @@ #ifdef HAVE_ELEMENTARY_X if (editable) - elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, _drag_drop_cb, NULL); + elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, _drag_drop_cb, NULL); else - elm_drop_target_del(obj); + elm_drop_target_del(obj); #endif } @@ -1925,9 +1925,9 @@ if (!wd) return; if (wd->selmode) { - wd->selmode = EINA_FALSE; - edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE); - edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); + wd->selmode = EINA_FALSE; + edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE); + edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); } wd->have_selection = EINA_FALSE; edje_object_part_text_select_none(wd->ent, "elm.text"); @@ -1948,9 +1948,9 @@ if (!wd) return; if (wd->selmode) { - wd->selmode = EINA_FALSE; - edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE); - edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); + wd->selmode = EINA_FALSE; + edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE); + edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); } wd->have_selection = EINA_TRUE; edje_object_part_text_select_all(wd->ent, "elm.text"); @@ -2379,7 +2379,7 @@ * and object to do this), then this object is used to replace that item. If * not the next provider is called until one provides an item object, or the * default provider in entry does. - * + * * @param obj The entry object * @param func The function called to provide the item object * @param data The data passed to @p func @@ -2405,7 +2405,7 @@ * * This prepends the given callback. See elm_entry_item_provider_append() for * more information - * + * * @param obj The entry object * @param func The function called to provide the item object * @param data The data passed to @p func @@ -2431,7 +2431,7 @@ * * This removes the given callback. See elm_entry_item_provider_append() for * more information - * + * * @param obj The entry object * @param func The function called to provide the item object * @param data The data passed to @p func @@ -2485,10 +2485,10 @@ wd = elm_widget_data_get(obj); EINA_SAFETY_ON_NULL_RETURN(func); - + tf = _filter_new(func, data); if (!tf) return; - + wd->text_filters = eina_list_append(wd->text_filters, tf); } @@ -2517,7 +2517,7 @@ tf = _filter_new(func, data); if (!tf) return; - + wd->text_filters = eina_list_prepend(wd->text_filters, tf); } @@ -2630,11 +2630,11 @@ * scrolled_entry */ widget_type = elm_widget_type_get(entry); if (!strcmp(widget_type, "entry")) - text_get = elm_entry_entry_get; + text_get = elm_entry_entry_get; else if (!strcmp(widget_type, "scrolled_entry")) - text_get = elm_scrolled_entry_entry_get; + text_get = elm_scrolled_entry_entry_get; else /* huh? */ - return; + return; current = elm_entry_markup_to_utf8(text_get(entry)); @@ -2676,7 +2676,7 @@ newlen -= (newlen - p); } if (newlen) - (*text)[newlen] = 0; + (*text)[newlen] = 0; else { free(*text); @@ -2708,7 +2708,7 @@ EINA_SAFETY_ON_NULL_RETURN(text); if ((!as->accepted) && (!as->rejected)) - return; + return; if (as->accepted) { @@ -2743,7 +2743,7 @@ int size = read_idx - last_read_idx; const char *src = (*text) + last_read_idx; if (src != insert) - memcpy(insert, *text + last_read_idx, size); + memcpy(insert, *text + last_read_idx, size); insert += size; } last_read_idx = read_idx; @@ -2771,8 +2771,8 @@ if (!wd) return; if (wd->delay_write) { - ecore_timer_del(wd->delay_write); - wd->delay_write = NULL; + ecore_timer_del(wd->delay_write); + wd->delay_write = NULL; } if (wd->autosave) _save(obj); eina_stringshare_replace(&wd->file, file); @@ -2815,8 +2815,8 @@ if (!wd) return; if (wd->delay_write) { - ecore_timer_del(wd->delay_write); - wd->delay_write = NULL; + ecore_timer_del(wd->delay_write); + wd->delay_write = NULL; } _save(obj); wd->delay_write = ecore_timer_add(2.0, _delay_write, obj); Modified: trunk/elementary/src/lib/elm_flip.c =================================================================== --- trunk/elementary/src/lib/elm_flip.c 2011-04-01 11:26:58 UTC (rev 58251) +++ trunk/elementary/src/lib/elm_flip.c 2011-04-01 11:32:33 UTC (rev 58252) @@ -27,7 +27,7 @@ Elm_Flip_Mode mode; Evas_Object *clip; struct { - Evas_Object *content, *clip; + Evas_Object *content, *clip; } front, back; Eina_Bool state : 1; }; @@ -89,12 +89,12 @@ evas_object_size_hint_max_get(wd->front.content, &maxw, &maxh); if (wd->back.content) evas_object_size_hint_max_get(wd->back.content, &maxw2, &maxh2); - + if (minw2 > minw) minw = minw2; if (minh2 > minh) minh = minh2; if ((maxw2 >= 0) && (maxw2 < maxw)) maxw = maxw2; if ((maxh2 >= 0) && (maxh2 < maxh)) maxh = maxh2; - + evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, maxw, maxh); } @@ -115,19 +115,19 @@ if (!wd) return; if (sub == wd->front.content) { - evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - wd->front.content = NULL; + wd->front.content = NULL; evas_object_hide(wd->front.clip); - _sizing_eval(obj); + _sizing_eval(obj); } else if (sub == wd->back.content) { - evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - wd->back.content = NULL; + wd->back.content = NULL; evas_object_hide(wd->back.clip); - _sizing_eval(obj); + _sizing_eval(obj); } } @@ -138,24 +138,24 @@ if (elm_flip_front_get(obj)) { if (wd->front.content) - evas_object_show(wd->front.clip); + evas_object_show(wd->front.clip); else - evas_object_hide(wd->front.clip); + evas_object_hide(wd->front.clip); if (wd->back.content) - evas_object_hide(wd->back.clip); + evas_object_hide(wd->back.clip); else - evas_object_hide(wd->back.clip); + evas_object_hide(wd->back.clip); } else { if (wd->front.content) - evas_object_hide(wd->front.clip); + evas_object_hide(wd->front.clip); else - evas_object_hide(wd->front.clip); + evas_object_hide(wd->front.clip); if (wd->back.content) - evas_object_show(wd->back.clip); + evas_object_show(wd->back.clip); else - evas_object_hide(wd->back.clip); + evas_object_hide(wd->back.clip); } } @@ -190,16 +190,16 @@ evas_object_geometry_get(wd->back.content, &x, &y, &w, &h); evas_map_util_points_populate_from_geometry(mb, x, y, w, h, 0); } - + evas_object_geometry_get(obj, &x, &y, &w, &h); - + cx = x + (w / 2); cy = y + (h / 2); px = x + (w / 2); py = y + (h / 2); foc = 2048; - + lx = cx; ly = cy; lz = -10000; @@ -209,106 +209,106 @@ lar = 0; lag = 0; lab = 0; - + switch (wd->mode) { - case ELM_FLIP_ROTATE_Y_CENTER_AXIS: - p = 1.0 - t; - p = 1.0 - (p * p); - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, 0); - evas_map_util_3d_rotate(mb, 0.0, deg + 180.0, 0.0, cx, cy, 0); - break; - case ELM_FLIP_ROTATE_X_CENTER_AXIS: - p = 1.0 - t; - p = 1.0 - (p * p); - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, 0); - evas_map_util_3d_rotate(mb, deg + 180.0, 0.0, 0.0, cx, cy, 0); - break; - case ELM_FLIP_ROTATE_XZ_CENTER_AXIS: - p = 1.0 - t; - p = 1.0 - (p * p); - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - evas_map_util_3d_rotate(mf, deg, 0.0, deg, cx, cy, 0); - evas_map_util_3d_rotate(mb, deg + 180.0, 0.0, deg + 180.0, cx, cy, 0); - break; - case ELM_FLIP_ROTATE_YZ_CENTER_AXIS: - p = 1.0 - t; - p = 1.0 - (p * p); - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - evas_map_util_3d_rotate(mf, 0.0, deg, deg, cx, cy, 0); - evas_map_util_3d_rotate(mb, 0.0, deg + 180.0, deg + 180.0, cx, cy, 0); - break; - case ELM_FLIP_CUBE_LEFT: - p = 1.0 - t; - p = 1.0 - (p * p); - deg = -90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg + 90, 0.0, cx, cy, w / 2); - } - else - { - evas_map_util_3d_rotate(mf, 0.0, deg + 90, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); - } - break; - case ELM_FLIP_CUBE_RIGHT: - p = 1.0 - t; - p = 1.0 - (p * p); - deg = 90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg - 90, 0.0, cx, cy, w / 2); - } - else - { - evas_map_util_3d_rotate(mf, 0.0, deg - 90, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); - } - break; - case ELM_FLIP_CUBE_UP: - p = 1.0 - t; - p = 1.0 - (p * p); - deg = -90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg + 90, 0.0, 0.0, cx, cy, h / 2); - } - else - { - evas_map_util_3d_rotate(mf, deg + 90, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); - } - break; - case ELM_FLIP_CUBE_DOWN: - p = 1.0 - t; - p = 1.0 - (p * p); - deg = 90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg - 90, 0.0, 0.0, cx, cy, h / 2); - } - else - { - evas_map_util_3d_rotate(mf, deg - 90, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); - } - break; - default: - break; + case ELM_FLIP_ROTATE_Y_CENTER_AXIS: + p = 1.0 - t; + p = 1.0 - (p * p); + if (wd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, 0); + evas_map_util_3d_rotate(mb, 0.0, deg + 180.0, 0.0, cx, cy, 0); + break; + case ELM_FLIP_ROTATE_X_CENTER_AXIS: + p = 1.0 - t; + p = 1.0 - (p * p); + if (wd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, 0); + evas_map_util_3d_rotate(mb, deg + 180.0, 0.0, 0.0, cx, cy, 0); + break; + case ELM_FLIP_ROTATE_XZ_CENTER_AXIS: + p = 1.0 - t; + p = 1.0 - (p * p); + if (wd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + evas_map_util_3d_rotate(mf, deg, 0.0, deg, cx, cy, 0); + evas_map_util_3d_rotate(mb, deg + 180.0, 0.0, deg + 180.0, cx, cy, 0); + break; + case ELM_FLIP_ROTATE_YZ_CENTER_AXIS: + p = 1.0 - t; + p = 1.0 - (p * p); + if (wd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + evas_map_util_3d_rotate(mf, 0.0, deg, deg, cx, cy, 0); + evas_map_util_3d_rotate(mb, 0.0, deg + 180.0, deg + 180.0, cx, cy, 0); + break; + case ELM_FLIP_CUBE_LEFT: + p = 1.0 - t; + p = 1.0 - (p * p); + deg = -90.0 * p; + if (wd->state) + { + evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg + 90, 0.0, cx, cy, w / 2); + } + else + { + evas_map_util_3d_rotate(mf, 0.0, deg + 90, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); + } + break; + case ELM_FLIP_CUBE_RIGHT: + p = 1.0 - t; + p = 1.0 - (p * p); + deg = 90.0 * p; + if (wd->state) + { + evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg - 90, 0.0, cx, cy, w / 2); + } + else + { + evas_map_util_3d_rotate(mf, 0.0, deg - 90, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); + } + break; + case ELM_FLIP_CUBE_UP: + p = 1.0 - t; + p = 1.0 - (p * p); + deg = -90.0 * p; + if (wd->state) + { + evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg + 90, 0.0, 0.0, cx, cy, h / 2); + } + else + { + evas_map_util_3d_rotate(mf, deg + 90, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); + } + break; + case ELM_FLIP_CUBE_DOWN: + p = 1.0 - t; + p = 1.0 - (p * p); + deg = 90.0 * p; + if (wd->state) + { + evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg - 90, 0.0, 0.0, cx, cy, h / 2); + } + else + { + evas_map_util_3d_rotate(mf, deg - 90, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); + } + break; + default: + break; } - + if (wd->front.content) { evas_map_util_3d_lighting(mf, lx, ly, lz, lr, lg, lb, lar, lag, lab); @@ -318,7 +318,7 @@ if (evas_map_util_clockwise_get(mf)) evas_object_show(wd->front.clip); else evas_object_hide(wd->front.clip); } - + if (wd->back.content) { evas_map_util_3d_lighting(mb, lx, ly, lz, lr, lg, lb, lar, lag, lab); @@ -328,10 +328,10 @@ if (evas_map_util_clockwise_get(mb)) evas_object_show(wd->back.clip); else evas_object_hide(wd->back.clip); } - + evas_map_free(mf); evas_map_free(mb); - + if (t >= 1.0) { evas_object_map_enable_set(wd->front.content, 0); @@ -380,7 +380,7 @@ static void _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) -{ +{ _configure(obj); } @@ -406,7 +406,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "flip"); elm_widget_type_set(obj, "flip"); elm_widget_sub_object_add(parent, obj); @@ -424,7 +424,7 @@ elm_widget_sub_object_add(obj, wd->clip); evas_object_clip_set(wd->clip, evas_object_clip_get(obj)); evas_object_smart_member_add(wd->clip, obj); - + wd->front.clip = evas_object_rectangle_add(e); evas_object_static_clip_set(wd->front.clip, 1); evas_object_data_set(wd->front.clip, "_elm_leaveme", obj); @@ -434,7 +434,7 @@ elm_widget_sub_object_add(obj, wd->front.clip); evas_object_smart_member_add(wd->front.clip, obj); evas_object_clip_set(wd->front.clip, wd->clip); - + wd->back.clip = evas_object_rectangle_add(e); evas_object_static_clip_set(wd->back.clip, 1); evas_object_data_set(wd->back.clip, "_elm_leaveme", obj); @@ -448,9 +448,9 @@ evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL); evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL); - + wd->state = 1; - + _sizing_eval(obj); return obj; } @@ -478,13 +478,13 @@ wd->front.content = content; if (content) { - elm_widget_sub_object_add(obj, content); + elm_widget_sub_object_add(obj, content); evas_object_smart_member_add(content, obj); evas_object_clip_set(content, wd->front.clip); - evas_object_event_callback_add(content, + evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - _sizing_eval(obj); + _changed_size_hints, obj); + _sizing_eval(obj); } // force calc to contents are the right size before transition evas_smart_objects_calculate(evas_object_evas_get(obj)); @@ -515,13 +515,13 @@ wd->back.content = content; if (content) { - elm_widget_sub_object_add(obj, content); + elm_widget_sub_object_add(obj, content); evas_object_smart_member_add(content, obj); evas_object_clip_set(content, wd->back.clip); - evas_object_event_callback_add(content, + evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - _sizing_eval(obj); + _changed_size_hints, obj); + _sizing_eval(obj); } // force calc to contents are the right size before transition evas_smart_objects_calculate(evas_object_evas_get(obj)); @@ -665,7 +665,7 @@ * ELM_FLIP_ROTATE_YZ_CENTER_AXIS * ELM_FLIP_CUBE_LEFT * ELM_FLIP_CUBE_RIGHT - * + * * FIXME: add - ELM_FLIP_CUBE_UP * FIXMEL add - ELM_FLIP_CUBE_DOWN * Modified: trunk/elementary/src/lib/elm_flipselector.c =================================================================== --- trunk/elementary/src/lib/elm_flipselector.c 2011-04-01 11:26:58 UTC (rev 58251) +++ trunk/elementary/src/lib/elm_flipselector.c 2011-04-01 11:32:33 UTC (rev 58252) @@ -73,13 +73,13 @@ {NULL, NULL} }; -#define ELM_FLIPSELECTOR_ITEM_CHECK_DELETED_RETURN(it, ...) \ +#define ELM_FLIPSELECTOR_ITEM_CHECK_DELETED_RETURN(it, ...) \ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); \ - if (it->deleted) \ - { \ - ERR(""#it" has been DELETED.\n"); \ - return __VA_ARGS__; \ - } \ + if (it->deleted) \ + { \ + ERR(""#it" has been DELETED.\n"); \ + return __VA_ARGS__; \ + } \ static Elm_Flipselector_Item * _item_new(Evas_Object *obj, const char *label, Evas_Smart_Cb func, const void *data) @@ -125,7 +125,7 @@ ERR("flipselector deleted while walking.\n"); EINA_LIST_FREE(wd->items, item) - _item_free(item); + _item_free(item); if (wd->spin) ecore_timer_del(wd->spin); free(wd); @@ -142,18 +142,18 @@ return; _elm_theme_object_set(obj, wd->base, "flipselector", "base", - elm_widget_style_get(obj)); + elm_widget_style_get(obj)); edje_object_scale_set(wd->base, - elm_widget_scale_get(obj) * _elm_config->scale); + elm_widget_scale_get(obj) * _elm_config->scale); max_len = edje_object_data_get(wd->base, "max_len"); if (!max_len) wd->max_len = MAX_LEN_DEFAULT; else { - wd->max_len = atoi(max_len); - if (!wd->max_len) - wd->max_len = MAX_LEN_DEFAULT; + wd->max_len = atoi(max_len); + if (!wd->max_len) + wd->max_len = MAX_LEN_DEFAULT; } _update_view(obj); @@ -168,17 +168,17 @@ if (!wd->items) { - wd->sentinel = NULL; - return; + wd->sentinel = NULL; + return; } wd->sentinel = wd->items; EINA_LIST_FOREACH(wd->items, l, it) { - if (strlen(elm_flipselector_item_label_get(it)) > - strlen(elm_flipselector_item_label_get(DATA_GET(wd->sentinel)))) - wd->sentinel = l; + if (strlen(elm_flipselector_item_label_get(it)) > + strlen(elm_flipselector_item_label_get(DATA_GET(wd->sentinel)))) + wd->sentinel = l; } } @@ -195,28 +195,28 @@ EINA_LIST_FOREACH(wd->items, l, it) { - if (!it->deleted) - continue; + if (!it->deleted) + continue; - if (wd->current == l) - { - if (wd->current == wd->sentinel) - sentinel_eval = EINA_TRUE; + if (wd->current == l) + { + if (wd->current == wd->sentinel) + sentinel_eval = EINA_TRUE; - wd->current = eina_list_prev(wd->current); - } - wd->items = eina_list_remove(wd->items, it); + wd->current = eina_list_prev(wd->current); + } + wd->items = eina_list_remove(wd->items, it); - if (!wd->current) - wd->current = wd->items; + if (!wd->current) + wd->current = wd->items; _item_free(it); - skip = EINA_FALSE; + skip = EINA_FALSE; - if (eina_list_count(wd->items) <= 1) - edje_object_signal_emit(wd->base, "elm,state,button,hidden", "elm"); - else - edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm"); + if (eina_list_count(wd->items) <= 1) + edje_object_signal_emit(wd->base, "elm,state,button,hidden", "elm"); + else + edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm"); } if (!skip) @@ -233,8 +233,8 @@ { if (wd->walking < 0) { - ERR("walking was negative. fixed!\n"); - wd->walking = 0; + ERR("walking was negative. fixed!\n"); + wd->walking = 0; } wd->walking++; } @@ -245,8 +245,8 @@ wd->walking--; if (wd->walking < 0) { - ERR("walking became negative. fixed!\n"); - wd->walking = 0; + ERR("walking became negative. fixed!\n"); + wd->walking = 0; } if (wd->walking) @@ -306,13 +306,13 @@ /* FIXME: no treatment of this signal so far */ if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->base, "elm,action,focus", "elm"); - evas_object_focus_set(wd->base, EINA_TRUE); + edje_object_signal_emit(wd->base, "elm,action,focus", "elm"); + evas_object_focus_set(wd->base, EINA_TRUE); } else { - edje_object_signal_emit(wd->base, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->base, EINA_FALSE); + edje_object_signal_emit(wd->base, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->base, EINA_FALSE); } } @@ -331,11 +331,11 @@ if (wd->sentinel) { - const char *label = \ - elm_flipselector_item_label_get(DATA_GET(wd->sentinel)); + const char *label = \ + elm_flipselector_item_label_get(DATA_GET(wd->sentinel)); - tmp = edje_object_part_text_get(wd->base, "top"); - edje_object_part_text_set(wd->base, "top", label); + tmp = edje_object_part_text_get(wd->base, "top"); + edje_object_part_text_set(wd->base, "top", label); } edje_object_size_min_restricted_calc(wd->base, &minw, &minh, minw, minh); @@ -410,8 +410,8 @@ if (wd->current == wd->items) { - wd->current = eina_list_last(wd->items); - evas_object_smart_callback_call(wd->self, SIG_UNDERFLOWED, NULL); + wd->current = eina_list_last(wd->items); + evas_object_smart_callback_call(wd->self, SIG_UNDERFLOWED, NULL); } else wd->current = eina_list_prev(wd->current); @@ -444,7 +444,7 @@ return ECORE_CALLBACK_RENEW; - val_up_exit_on_error: +val_up_exit_on_error: return ECORE_CALLBACK_CANCEL; } @@ -475,8 +475,8 @@ wd->current = eina_list_next(wd->current); if (!wd->current) { - wd->current = wd->items; - evas_object_smart_callback_call(wd->self, SIG_OVERFLOWED, NULL); + wd->current = wd->items; + evas_object_smart_callback_call(wd->self, SIG_OVERFLOWED, NULL); } item = DATA_GET(wd->current); @@ -506,7 +506,7 @@ return ECORE_CALLBACK_RENEW; - val_down_exit_on_error: +val_down_exit_on_error: return ECORE_CALLBACK_CANCEL; } @@ -544,13 +544,13 @@ Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_add(wd->base, "elm,action,up,start", - "", _signal_val_up_start, obj); + "", _signal_val_up_start, obj); edje_object_signal_callback_add(wd->base, "elm,action,up,stop", - "", _signal_val_change_stop, obj); + "", _signal_val_change_stop, obj); edje_object_signal_callback_add(wd->base, "elm,action,down,start", - "", _signal_val_down_start, obj); + "", _signal_val_down_start, obj); edje_object_signal_callback_add(wd->base, "elm,action,down,stop", - "", _signal_val_change_stop, obj); + "", _signal_val_change_stop, obj); } /** @@ -569,7 +569,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "flipselector"); elm_widget_type_set(obj, "flipselector"); elm_widget_sub_object_add(parent, obj); @@ -675,16 +675,16 @@ wd->items = eina_list_append(wd->items, item); if (!wd->current) { - wd->current = wd->items; - _update_view(obj); + wd->current = wd->items; + _update_view(obj); } if (!wd->sentinel || (strlen(elm_flipselector_item_label_get(item)) > - strlen(elm_flipselector_item_label_get(DATA_GET(wd->sentinel))))) + strlen(elm_flipselector_item_label_get(DATA_GET(wd->sentinel))))) { - wd->sentinel = eina_list_last(wd->items); - _sizing_eval(obj); + wd->sentinel = eina_list_last(wd->items); + _sizing_eval(obj); } if (eina_list_count(wd->items) >= 2) @@ -726,16 +726,16 @@ wd->items = eina_list_prepend(wd->items, item); if (!wd->current) { - wd->current = wd->items; - _update_view(obj); + wd->current = wd->items; + _update_view(obj); } if (!wd->sentinel || (strlen(elm_flipselector_item_label_get(item)) > - strlen(elm_flipselector_item_label_get(DATA_GET(wd->sentinel))))) + strlen(elm_flipselector_item_label_get(DATA_GET(wd->sentinel))))) { - wd->sentinel = wd->items; - _sizing_eval(obj); + wd->sentinel = wd->items; + _sizing_eval(obj); } if (eina_list_count(wd->items) >= 2) @@ -788,10 +788,10 @@ EINA_LIST_FOREACH(wd->items, l, it) { - if (it->deleted) - continue; + if (it->deleted) + continue; - return it; + return it; } return NULL; @@ -820,10 +820,10 @@ EINA_LIST_REVERSE_FOREACH(wd->items, l, it) { - if (it->deleted) - continue; + if (it->deleted) + continue; - return it; + return it; } return NULL; @@ -899,15 +899,15 @@ EINA_LIST_FOREACH(wd->items, l, _item) { - if (_item == cur) + if (_item == cur) flipside = MSG_FLIP_DOWN; - if (_item == item) - { - wd->current = l; + if (_item == item) + { + wd->current = l; _send_msg(wd, flipside, (char *)item->label); - break; - } + break; + } } _flipselector_unwalk(wd); @@ -952,8 +952,8 @@ if (wd->walking > 0) { - item->deleted = EINA_TRUE; - return; + item->deleted = EINA_TRUE; + return; } _flipselector_walk(wd); @@ -987,8 +987,8 @@ return NULL; EINA_LIST_FOREACH(wd->items, l, _item) - if (_item == item) - return item->label; + if (_item == item) + return item->label; return NULL; } @@ -1029,8 +1029,8 @@ if (wd->current == l) { - _update_view(item->base.widget); - _sizing_eval(wd->self); + _update_view(item->base.widget); + _sizing_eval(wd->self); } return; @@ -1058,13 +1058,13 @@ return NULL; EINA_LIST_FOREACH(wd->items, l, _item) - if (_item == item) - { - l = eina_list_prev(l); - if (!l) - return NULL; - return DATA_GET(l); - } + if (_item == item) + { + l = eina_list_prev(l); + if (!l) + return NULL; + return DATA_GET(l); + } return NULL; } @@ -1091,13 +1091,13 @@ return NULL; EINA_LIST_FOREACH(wd->items, l, _item) - if (_item == item) - { - l = eina_list_next(l); - if (!l) - return NULL; - return DATA_GET(l); - } + if (_item == item) + { + l = eina_list_next(l); + if (!l) + return NULL; + return DATA_GET(l); + } return NULL; } Modified: trunk/elementary/src/lib/elm_frame.c =================================================================== --- trunk/elementary/src/lib/elm_frame.c 2011-04-01 11:26:58 UTC (rev 58251) +++ trunk/elementary/src/lib/elm_frame.c 2011-04-01 11:32:33 UTC (rev 58252) @@ -102,10 +102,10 @@ if (!wd) return; if (sub == wd->content) { - evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - wd->content = NULL; - _sizing_eval(obj); + wd->content = NULL; + _sizing_eval(obj); } } @@ -125,7 +125,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "frame"); elm_widget_type_set(obj, "frame"); elm_widget_sub_object_add(parent, obj); @@ -206,10 +206,10 @@ wd->content = content; if (content) { - elm_widget_sub_object_add(obj, content); - evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->frm, "elm.swallow.content", content); + elm_widget_sub_object_add(obj, content); + evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->frm, "elm.swallow.content", content); } _sizing_eval(obj); } Modified: trunk/elementary/src/lib/elm_gengrid.c =================================================================== --- trunk/elementary/src/lib/elm_gengrid.c 2011-04-01 11:26:58 UTC (rev 58251) +++ trunk/elementary/src/lib/elm_gengrid.c 2011-04-01 11:32:33 UTC (rev 58252) @@ -12,8 +12,8 @@ * * Signals that you can add callbacks for are: * - * clicked - The user has double-clicked or pressed enter on - * a item. The event_infoparameter is the Gengrid item + * clicked - The user has double-clicked or pressed enter on + * a item. The event_infoparameter is the Gengrid item * that was double-clicked. * * selected - The user has made an item selected. The event_info @@ -156,12 +156,12 @@ * * Handle non-homogeneous objects too. */ -typedef struct _Widget_Data Widget_Data; -typedef struct _Pan Pan; + typedef struct _Widget_Data Widget_Data; + typedef struct _Pan Pan; #define PRELOAD 1 -struct _Elm_Gengrid_Item + struct _Elm_Gengrid_Item { Elm_Widget_Item base; EINA_INLIST; @@ -171,22 +171,22 @@ Widget_Data *wd; Eina_List *labels, *icons, *states, *icon_objs; struct - { - Evas_Smart_Cb func; - const void *data; - } func; + { + Evas_Smart_Cb func; + const void *data; + } func; Evas_Coord x, y, dx, dy; int relcount; int walking; struct - { - const void *data; - Elm_Tooltip_Item_Content_Cb content_cb; - Evas_Smart_Cb del_cb; - const char *style; - } tooltip; + { + const void *data; + Elm_Tooltip_Item_Content_Cb content_cb; + Evas_Smart_Cb del_cb; + const char *style; + } tooltip; const char *mouse_cursor; @@ -230,7 +230,7 @@ }; #define ELM_GENGRID_ITEM_FROM_INLIST(item) \ - ((item) ? EINA_INLIST_CONTAINER_GET(item, Elm_Gengrid_Item) : NULL) + ((item) ? EINA_INLIST_CONTAINER_GET(item, Elm_Gengrid_Item) : NULL) struct _Pan { @@ -796,7 +796,7 @@ { if (dx < 0) evas_object_smart_callback_call(item->wd->self, - left_drag, item); + left_drag, item); } } else @@ -808,10 +808,10 @@ { if (dx < 0) evas_object_smart_callback_call(item->wd->self, - left_drag, item); + left_drag, item); else evas_object_smart_callback_call(item->wd->self, - right_drag, item); + right_drag, item); } } } @@ -925,7 +925,7 @@ Elm_Gengrid_Item *item2; EINA_LIST_FOREACH_SAFE(item->wd->selected, l, l_next, item2) - if (item2 != item) _item_unselect(item2); + if (item2 != item) _item_unselect(item2); } _item_hilight(item); _item_select(item); @@ -958,7 +958,7 @@ _elm_theme_object_set(item->wd->self, item->base.view, "gengrid", style, elm_widget_style_get(item->wd->self)); item->spacer = - evas_object_rectangle_add(evas_object_evas_get(item->wd->self)); + evas_object_rectangle_add(evas_object_evas_get(item->wd->self)); evas_object_color_set(item->spacer, 0, 0, 0, 0); elm_widget_sub_object_add(item->wd->self, item->spacer); evas_object_size_hint_min_set(item->spacer, 2 * _elm_config->scale, 1); @@ -970,12 +970,12 @@ const char *key; item->labels = - elm_widget_stringlist_get(edje_object_data_get(item->base.view, - "labels")); + elm_widget_stringlist_get(edje_object_data_get(item->base.view, + "labels")); EINA_LIST_FOREACH(item->labels, l, key) { char *s = item->gic->func.label_get - ((void *)item->base.data, item->wd->self, l->data); + ((void *)item->base.data, item->wd->self, l->data); if (s) { edje_object_part_text_set(item->base.view, l->data, s); @@ -990,12 +990,12 @@ const char *key; item->icons = - elm_widget_stringlist_get(edje_object_data_get(item->base.view, - "icons")); + elm_widget_stringlist_get(edje_object_data_get(item->base.view, + "icons")); EINA_LIST_FOREACH(item->icons, l, key) { Evas_Object *ic = item->gic->func.icon_get - ((void *)item->base.data, item->wd->self, l->data); + ((void *)item->base.data, item->wd->self, l->data); if (ic) { item->icon_objs = eina_list_append(item->icon_objs, ic); @@ -1012,12 +1012,12 @@ const char *key; item->states = - elm_widget_stringlist_get(edje_object_data_get(item->base.view, - "states")); + elm_widget_stringlist_get(edje_object_data_get(item->base.view, + "states")); EINA_LIST_FOREACH(item->states, l, key) { Eina_Bool on = item->gic->func.state_get - ((void *)item->base.data, item->wd->self, l->data); + ((void *)item->base.data, item->wd->self, l->data); if (on) { snprintf(buf, sizeof(buf), "elm,state,%s,active", key); @@ -1089,7 +1089,7 @@ item->states = NULL; EINA_LIST_FREE(item->icon_objs, icon) - evas_object_del(icon); + evas_object_del(icon); item->realized = EINA_FAL... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2011-04-01 11:35:16
|
Log: elementary / calendar, button, colorselector, bg, cnp_helper, bubble, check, box, clock - removed white spaces Author: hermet Date: 2011-04-01 04:35:07 -0700 (Fri, 01 Apr 2011) New Revision: 58253 Trac: http://trac.enlightenment.org/e/changeset/58253 Modified: trunk/elementary/src/lib/elm_bg.c trunk/elementary/src/lib/elm_box.c trunk/elementary/src/lib/elm_bubble.c trunk/elementary/src/lib/elm_button.c trunk/elementary/src/lib/elm_calendar.c trunk/elementary/src/lib/elm_check.c trunk/elementary/src/lib/elm_clock.c trunk/elementary/src/lib/elm_cnp_helper.c trunk/elementary/src/lib/elm_colorselector.c Modified: trunk/elementary/src/lib/elm_bg.c =================================================================== --- trunk/elementary/src/lib/elm_bg.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_bg.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -49,7 +49,7 @@ if (wd->overlay) edje_object_part_swallow(wd->base, "elm.swallow.content", wd->overlay); -// FIXME: if i don't do this, bg doesnt calc correctly. why? + // FIXME: if i don't do this, bg doesnt calc correctly. why? evas_object_geometry_get(wd->base, NULL, NULL, &w, &h); evas_object_resize(wd->base, w, h); } @@ -83,33 +83,33 @@ switch (wd->option) { case ELM_BG_OPTION_CENTER: - fw = nw = iw; - fh = nh = ih; - nx = ((bw - fw) / 2); - ny = ((bh - fh) / 2); - mw = iw; - mh = ih; - break; + fw = nw = iw; + fh = nh = ih; + nx = ((bw - fw) / 2); + ny = ((bh - fh) / 2); + mw = iw; + mh = ih; + break; case ELM_BG_OPTION_SCALE: - fw = bw; - fh = ((ih * fw) / iw); - if (fh < bh) - { - fh = bh; - fw = ((iw * fh) / ih); - } - fx = ((bw - fw) / 2); - fy = ((bh - fh) / 2); - break; + fw = bw; + fh = ((ih * fw) / iw); + if (fh < bh) + { + fh = bh; + fw = ((iw * fh) / ih); + } + fx = ((bw - fw) / 2); + fy = ((bh - fh) / 2); + break; case ELM_BG_OPTION_TILE: - fw = iw; - fh = ih; - break; + fw = iw; + fh = ih; + break; case ELM_BG_OPTION_STRETCH: default: - fw = bw; - fh = bh; - break; + fw = bw; + fh = bh; + break; } evas_object_move(wd->img, nx, ny); @@ -136,7 +136,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "bg"); elm_widget_type_set(obj, "bg"); elm_widget_sub_object_add(parent, obj); @@ -203,7 +203,7 @@ { wd->img = evas_object_image_add(evas_object_evas_get(wd->base)); if ((wd->load_opts.w > 0) && (wd->load_opts.h > 0)) - evas_object_image_load_size_set(wd->img, wd->load_opts.w, wd->load_opts.h); + evas_object_image_load_size_set(wd->img, wd->load_opts.w, wd->load_opts.h); evas_object_image_file_set(wd->img, file, group); } evas_object_repeat_events_set(wd->img, EINA_TRUE); @@ -340,8 +340,8 @@ if (!wd) return; if (wd->overlay) { - evas_object_del(wd->overlay); - wd->overlay = NULL; + evas_object_del(wd->overlay); + wd->overlay = NULL; } if (overlay) { @@ -419,6 +419,6 @@ wd->load_opts.h = h; if (!wd->img) return; if (!(((p = strrchr(wd->file, '.'))) && (!strcasecmp(p, ".edj")))) - evas_object_image_load_size_set(wd->img, w, h); + evas_object_image_load_size_set(wd->img, w, h); } Modified: trunk/elementary/src/lib/elm_box.c =================================================================== --- trunk/elementary/src/lib/elm_box.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_box.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -40,11 +40,11 @@ Ecore_Animator *animator; struct - { - Evas_Object_Box_Layout layout; - void *data; - void(*free_data)(void *data); - } start, end; + { + Evas_Object_Box_Layout layout; + void *data; + void(*free_data)(void *data); + } start, end; void(*transition_end_cb)(void *data); void *transition_end_data; @@ -57,9 +57,9 @@ { Evas_Object *obj; struct - { - Evas_Coord x, y, w, h; - } start, end; + { + Evas_Coord x, y, w, h; + } start, end; }; static const char *widtype = NULL; @@ -71,11 +71,11 @@ static void _del_pre_hook(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); + Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - evas_object_event_callback_del_full - (wd->box, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - evas_object_box_remove_all(wd->box, 0); + evas_object_event_callback_del_full + (wd->box, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); + evas_object_box_remove_all(wd->box, 0); } static void @@ -166,7 +166,7 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; _els_box_layout(o, priv, wd->horizontal, wd->homogeneous, - elm_widget_mirrored_get(obj)); + elm_widget_mirrored_get(obj)); } static Eina_Bool @@ -226,7 +226,7 @@ const double curtime = ecore_loop_time_get(); layout_data->duration = - layout_data->duration - (curtime - layout_data->initial_time); + layout_data->duration - (curtime - layout_data->initial_time); layout_data->initial_time = curtime; evas_object_geometry_get(obj, &x, &y, &w, &h); @@ -256,7 +256,7 @@ Transition_Animation_Data *tad; EINA_LIST_FREE(layout_data->objs, tad) - free(tad); + free(tad); EINA_LIST_FOREACH(priv->children, l, opt) { @@ -264,7 +264,7 @@ if (!tad) { EINA_LIST_FREE(layout_data->objs, tad) - free(tad); + free(tad); layout_data->objs = NULL; return EINA_FALSE; } @@ -283,7 +283,7 @@ layout_data->initial_time = ecore_loop_time_get(); if (!_transition_layout_load_children_list(priv, layout_data)) - return EINA_FALSE; + return EINA_FALSE; _transition_layout_calculate_coords(obj, priv, layout_data); evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, @@ -293,7 +293,7 @@ evas_object_smart_callback_add(obj, SIG_CHILD_REMOVED, _transition_layout_child_removed, layout_data); if (!layout_data->animator) - layout_data->animator = ecore_animator_add(transition_animation_cb, obj); + layout_data->animator = ecore_animator_add(transition_animation_cb, obj); layout_data->animation_ended = EINA_FALSE; return EINA_TRUE; } @@ -309,7 +309,7 @@ } if (layout_data->transition_end_cb) - layout_data->transition_end_cb(layout_data->transition_end_data); + layout_data->transition_end_cb(layout_data->transition_end_data); } static void @@ -352,7 +352,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "box"); elm_widget_type_set(obj, "box"); elm_widget_sub_object_add(parent, obj); @@ -366,11 +366,11 @@ wd->box = evas_object_box_add(e); /*evas_object_box_layout_set(wd->box, evas_object_box_layout_vertical, - NULL, NULL);*/ + NULL, NULL);*/ evas_object_box_layout_set(wd->box, _layout, obj, NULL); evas_object_event_callback_add(wd->box, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + _changed_size_hints, obj); elm_widget_resize_object_set(obj, wd->box); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); @@ -400,21 +400,21 @@ evas_object_smart_calculate(wd->box); /*if (wd->horizontal) { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_horizontal, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_horizontal, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); } - else + else { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_vertical, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_vertical, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); }*/ } @@ -456,21 +456,21 @@ evas_object_smart_calculate(wd->box); /*if (wd->horizontal) { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_horizontal, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_horizontal, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); } - else + else { - if (wd->homogeneous) - evas_object_box_layout_set(wd->box, - evas_object_box_layout_homogeneous_vertical, NULL, NULL); - else - evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, - NULL, NULL); + if (wd->homogeneous) + evas_object_box_layout_set(wd->box, + evas_object_box_layout_homogeneous_vertical, NULL, NULL); + else + evas_object_box_layout_set(wd->box, evas_object_box_layout_horizontal, + NULL, NULL); }*/ } @@ -703,15 +703,15 @@ if (box_data->animation_ended) { - box_data->end.layout(obj, priv, box_data->end.data); - return; + box_data->end.layout(obj, priv, box_data->end.data); + return; } if (!box_data->animator) { if (!_transition_layout_animation_start(obj, priv, box_data, - _transition_animation)) - return; + _transition_animation)) + return; } else { @@ -723,9 +723,9 @@ } if ((curtime >= box_data->duration + box_data->initial_time)) - _transition_layout_animation_stop(box_data); + _transition_layout_animation_stop(box_data); else - _transition_layout_animation_exec(obj, priv, box_data, curtime); + _transition_layout_animation_exec(obj, priv, box_data, curtime); } /** @@ -751,12 +751,12 @@ */ EAPI Elm_Box_Transition * elm_box_transition_new(const double duration, - Evas_Object_Box_Layout start_layout, void *start_layout_data, - void(*start_layout_free_data)(void *data), - Evas_Object_Box_Layout end_layout, void *end_layout_data, - void(*end_layout_free_data)(void *data), - void(*transition_end_cb)(void *data), - void *transition_end_data) + Evas_Object_Box_Layout start_layout, void *start_layout_data, + void(*start_layout_free_data)(void *data), + Evas_Object_Box_Layout end_layout, void *end_layout_data, + void(*end_layout_free_data)(void *data), + void(*transition_end_cb)(void *data), + void *transition_end_data) { Elm_Box_Transition *box_data; @@ -765,7 +765,7 @@ box_data = calloc(1, sizeof(Elm_Box_Transition)); if (!box_data) - return NULL; + return NULL; box_data->start.layout = start_layout; box_data->start.data = start_layout_data; @@ -797,9 +797,9 @@ Transition_Animation_Data *tad; Elm_Box_Transition *box_data = data; if ((box_data->start.free_data) && (box_data->start.data)) - box_data->start.free_data(box_data->start.data); + box_data->start.free_data(box_data->start.data); if ((box_data->end.free_data) && (box_data->end.data)) - box_data->end.free_data(box_data->end.data); + box_data->end.free_data(box_data->end.data); EINA_LIST_FREE(box_data->objs, tad) free(tad); evas_object_event_callback_del(box_data->box, EVAS_CALLBACK_RESIZE, _transition_layout_obj_resize_cb); Modified: trunk/elementary/src/lib/elm_bubble.c =================================================================== --- trunk/elementary/src/lib/elm_bubble.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_bubble.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -32,8 +32,8 @@ #define SIG_CLICKED "clicked" static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CLICKED, ""}, - {NULL, NULL} + {SIG_CLICKED, ""}, + {NULL, NULL} }; static void @@ -73,7 +73,7 @@ if (wd->content) { edje_object_part_swallow(wd->bbl, "elm.swallow.content", wd->content); - edje_object_message_signal_process(wd->bbl); + edje_object_message_signal_process(wd->bbl); } if (wd->icon) edje_object_signal_emit(wd->bbl, "elm,state,icon,visible", "elm"); @@ -126,13 +126,13 @@ Evas_Object *sub = event_info; if (!wd) return; evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); + _changed_size_hints, obj); if (sub == wd->content) wd->content = NULL; else if (sub == wd->icon) { - edje_object_signal_emit(wd->bbl, "elm,state,icon,hidden", "elm"); - wd->icon = NULL; - edje_object_message_signal_process(wd->bbl); + edje_object_signal_emit(wd->bbl, "elm,state,icon,hidden", "elm"); + wd->icon = NULL; + edje_object_message_signal_process(wd->bbl); } _sizing_eval(obj); } @@ -164,7 +164,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "bubble"); elm_widget_type_set(obj, "bubble"); elm_widget_sub_object_add(parent, obj); @@ -310,10 +310,10 @@ wd->content = content; if (content) { - elm_widget_sub_object_add(obj, content); - evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->bbl, "elm.swallow.content", content); + elm_widget_sub_object_add(obj, content); + evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->bbl, "elm.swallow.content", content); } _sizing_eval(obj); } @@ -385,12 +385,12 @@ wd->icon = icon; if (icon) { - elm_widget_sub_object_add(obj, icon); - edje_object_part_swallow(wd->bbl, "elm.swallow.icon", icon); - evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_signal_emit(wd->bbl, "elm,state,icon,visible", "elm"); - edje_object_message_signal_process(wd->bbl); + elm_widget_sub_object_add(obj, icon); + edje_object_part_swallow(wd->bbl, "elm.swallow.icon", icon); + evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_signal_emit(wd->bbl, "elm,state,icon,visible", "elm"); + edje_object_message_signal_process(wd->bbl); } _sizing_eval(obj); } Modified: trunk/elementary/src/lib/elm_button.c =================================================================== --- trunk/elementary/src/lib/elm_button.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_button.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -307,7 +307,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "button"); elm_widget_type_set(obj, "button"); elm_widget_sub_object_add(parent, obj); Modified: trunk/elementary/src/lib/elm_calendar.c =================================================================== --- trunk/elementary/src/lib/elm_calendar.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_calendar.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -27,9 +27,9 @@ typedef enum _Day_Color // EINA_DEPRECATED { - DAY_WEEKDAY = 0, - DAY_SATURDAY = 1, - DAY_SUNDAY = 2 + DAY_WEEKDAY = 0, + DAY_SATURDAY = 1, + DAY_SUNDAY = 2 } Day_Color; typedef struct _Widget_Data Widget_Data; @@ -72,8 +72,8 @@ static int _days_in_month[2][12] = { - {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, - {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} + {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} }; static Elm_Calendar_Mark * @@ -119,10 +119,10 @@ month = time->tm_mon; year = time->tm_year + 1900; - return _days_in_month[((!(year % 4)) && - ((!(year % 400)) || - (year % 100)))] - [month]; + return _days_in_month[((!(year % 4)) && + ((!(year % 400)) || + (year % 100)))] + [month]; } static inline void @@ -186,22 +186,22 @@ _text_day_color_update(Widget_Data *wd, int pos) { char emission[32]; - + switch (wd->day_color[pos]) - { - case DAY_WEEKDAY: - snprintf(emission, sizeof(emission), "cit_%i,weekday", pos); - break; - case DAY_SATURDAY: - snprintf(emission, sizeof(emission), "cit_%i,saturday", pos); - break; - case DAY_SUNDAY: - snprintf(emission, sizeof(emission), "cit_%i,sunday", pos); - break; - default: - return; - } - + { + case DAY_WEEKDAY: + snprintf(emission, sizeof(emission), "cit_%i,weekday", pos); + break; + case DAY_SATURDAY: + snprintf(emission, sizeof(emission), "cit_%i,saturday", pos); + break; + case DAY_SUNDAY: + snprintf(emission, sizeof(emission), "cit_%i,sunday", pos); + break; + default: + return; + } + edje_object_signal_emit(wd->calendar, emission, "elm"); } @@ -239,8 +239,8 @@ buf = wd->format_func(&wd->selected_time); if (buf) { - edje_object_part_text_set(wd->calendar, "month_text", buf); - free(buf); + edje_object_part_text_set(wd->calendar, "month_text", buf); + free(buf); } else edje_object_part_text_set(wd->calendar, "month_text", ""); @@ -253,129 +253,129 @@ // Layout of the calendar is changed for removing the unfilled last row. wd->first_day_it = first_day.tm_wday; - - if ((35 - wd->first_day_it) > (maxdays - 1)) last_row = EINA_FALSE; - - if (!last_row) - { - char emission[32]; - - for (i = 0; i < 5; i++) - { - snprintf(emission, sizeof(emission), "cseph_%i,row_hide", i); - edje_object_signal_emit(wd->calendar, emission, "elm"); - } - snprintf(emission, sizeof(emission), "cseph_%i,row_invisible", 5); - edje_object_signal_emit(wd->calendar, emission, "elm"); - for (i = 0; i < 35; i++) - { - snprintf(emission, sizeof(emission), "cit_%i,cell_expanded", i); - edje_object_signal_emit(wd->calendar, emission, "elm"); - } - for (i = 35; i < 42; i++) - { - snprintf(emission, sizeof(emission), "cit_%i,cell_invisible", i); - edje_object_signal_emit(wd->calendar, emission, "elm"); - } - } - else - { - char emission[32]; - - for (i = 0; i < 6; i++) - { - snprintf(emission, sizeof(emission), "cseph_%i,row_show", i); - edje_object_signal_emit(wd->calendar, emission, "elm"); - } - for (i = 0; i < 42; i++) - { - snprintf(emission, sizeof(emission), "cit_%i,cell_default", i); - edje_object_signal_emit(wd->calendar, emission, "elm"); - } - } - + + if ((35 - wd->first_day_it) > (maxdays - 1)) last_row = EINA_FALSE; + + if (!last_row) + { + char emission[32]; + + for (i = 0; i < 5; i++) + { + snprintf(emission, sizeof(emission), "cseph_%i,row_hide", i); + edje_object_signal_emit(wd->calendar, emission, "elm"); + } + snprintf(emission, sizeof(emission), "cseph_%i,row_invisible", 5); + edje_object_signal_emit(wd->calendar, emission, "elm"); + for (i = 0; i < 35; i++) + { + snprintf(emission, sizeof(emission), "cit_%i,cell_expanded", i); + edje_object_signal_emit(wd->calendar, emission, "elm"); + } + for (i = 35; i < 42; i++) + { + snprintf(emission, sizeof(emission), "cit_%i,cell_invisible", i); + edje_object_signal_emit(wd->calendar, emission, "elm"); + } + } + else + { + char emission[32]; + + for (i = 0; i < 6; i++) + { + snprintf(emission, sizeof(emission), "cseph_%i,row_show", i); + edje_object_signal_emit(wd->calendar, emission, "elm"); + } + for (i = 0; i < 42; i++) + { + snprintf(emission, sizeof(emission), "cit_%i,cell_default", i); + edje_object_signal_emit(wd->calendar, emission, "elm"); + } + } + for (i = 0; i < 42; i++) { _text_day_color_update(wd, i); // EINA_DEPRECATED - if ((!day) && (i == first_day.tm_wday)) day = 1; + if ((!day) && (i == first_day.tm_wday)) day = 1; - if ((day == wd->current_time.tm_mday) - && (mon == wd->current_time.tm_mon) - && (year == wd->current_time.tm_year)) - _today(wd, i); + if ((day == wd->current_time.tm_mday) + && (mon == wd->current_time.tm_mon) + && (year == wd->current_time.tm_year)) + _today(wd, i); - if (day == wd->selected_time.tm_mday) - { - if ((wd->selected_it > -1) && (wd->selected_it != i)) - _unselect(wd, wd->selected_it); + if (day == wd->selected_time.tm_mday) + { + if ((wd->selected_it > -1) && (wd->selected_it != i)) + _unselect(wd, wd->selected_it); - if (wd->selection_enabled) _select(wd, i); + if (wd->selection_enabled) _select(wd, i); - wd->selected_it = i; - } + wd->selected_it = i; + } - if ((day) && (day <= maxdays)) - snprintf(day_s, sizeof(day_s), "%i", day++); - else + if ((day) && (day <= maxdays)) + snprintf(day_s, sizeof(day_s), "%i", day++); + else day_s[0] = 0; - snprintf(part, sizeof(part), "cit_%i.text", i); - edje_object_part_text_set(wd->calendar, part, day_s); - /* Clear previous marks */ - _cit_mark(wd->calendar, i, "clear"); + snprintf(part, sizeof(part), "cit_%i.text", i); + edje_object_part_text_set(wd->calendar, part, day_s); + /* Clear previous marks */ + _cit_mark(wd->calendar, i, "clear"); } /* Set marks */ EINA_LIST_FOREACH(wd->marks, l, mark) { - struct tm *mtime = &mark->mark_time; - int mon = wd->selected_time.tm_mon; - int year = wd->selected_time.tm_year; - int mday_it = mtime->tm_mday + wd->first_day_it - 1; + struct tm *mtime = &mark->mark_time; + int mon = wd->selected_time.tm_mon; + int year = wd->selected_time.tm_year; + int mday_it = mtime->tm_mday + wd->first_day_it - 1; - switch (mark->repeat) - { - case ELM_CALENDAR_UNIQUE: - if ((mtime->tm_mon == mon) && (mtime->tm_year == year)) - _cit_mark(wd->calendar, mday_it, mark->mark_type); - break; - case ELM_CALENDAR_DAILY: - if (((mtime->tm_year == year) && (mtime->tm_mon < mon)) || - (mtime->tm_year < year)) - day = 1; - else if ((mtime->tm_year == year) && (mtime->tm_mon == mon)) - day = mtime->tm_mday; - else - break; - for (; day <= maxdays; day++) - _cit_mark(wd->calendar, day + wd->first_day_it - 1, - mark->mark_type); - break; - case ELM_CALENDAR_WEEKLY: - if (((mtime->tm_year == year) && (mtime->tm_mon < mon)) || - (mtime->tm_year < year)) - day = 1; - else if ((mtime->tm_year == year) && (mtime->tm_mon == mon)) - day = mtime->tm_mday; - else - break; - for (; day <= maxdays; day++) - if (mtime->tm_wday == _weekday_get(wd->first_day_it, day)) - _cit_mark(wd->calendar, day + wd->first_day_it - 1, - mark->mark_type); - break; - case ELM_CALENDAR_MONTHLY: - if (((mtime->tm_year < year) || - ((mtime->tm_year == year) && (mtime->tm_mon <= mon))) && - (mtime->tm_mday <= maxdays)) - _cit_mark(wd->calendar, mday_it, mark->mark_type); - break; - case ELM_CALENDAR_ANNUALLY: - if ((mtime->tm_year <= year) && (mtime->tm_mon == mon) && - (mtime->tm_mday <= maxdays)) - _cit_mark(wd->calendar, mday_it, mark->mark_type); - break; - } + switch (mark->repeat) + { + case ELM_CALENDAR_UNIQUE: + if ((mtime->tm_mon == mon) && (mtime->tm_year == year)) + _cit_mark(wd->calendar, mday_it, mark->mark_type); + break; + case ELM_CALENDAR_DAILY: + if (((mtime->tm_year == year) && (mtime->tm_mon < mon)) || + (mtime->tm_year < year)) + day = 1; + else if ((mtime->tm_year == year) && (mtime->tm_mon == mon)) + day = mtime->tm_mday; + else + break; + for (; day <= maxdays; day++) + _cit_mark(wd->calendar, day + wd->first_day_it - 1, + mark->mark_type); + break; + case ELM_CALENDAR_WEEKLY: + if (((mtime->tm_year == year) && (mtime->tm_mon < mon)) || + (mtime->tm_year < year)) + day = 1; + else if ((mtime->tm_year == year) && (mtime->tm_mon == mon)) + day = mtime->tm_mday; + else + break; + for (; day <= maxdays; day++) + if (mtime->tm_wday == _weekday_get(wd->first_day_it, day)) + _cit_mark(wd->calendar, day + wd->first_day_it - 1, + mark->mark_type); + break; + case ELM_CALENDAR_MONTHLY: + if (((mtime->tm_year < year) || + ((mtime->tm_year == year) && (mtime->tm_mon <= mon))) && + (mtime->tm_mday <= maxdays)) + _cit_mark(wd->calendar, mday_it, mark->mark_type); + break; + case ELM_CALENDAR_ANNUALLY: + if ((mtime->tm_year <= year) && (mtime->tm_mon == mon) && + (mtime->tm_mday <= maxdays)) + _cit_mark(wd->calendar, mday_it, mark->mark_type); + break; + } } } @@ -389,8 +389,8 @@ for (i = 0; i < 7; i++) { - part[3] = i + '0'; - edje_object_part_text_set(wd->calendar, part, wd->weekdays[i]); + part[3] = i + '0'; + edje_object_part_text_set(wd->calendar, part, wd->weekdays[i]); } } @@ -408,10 +408,10 @@ if (wd->marks) { - EINA_LIST_FREE(wd->marks, mark) - { - _mark_free(mark); - } + EINA_LIST_FREE(wd->marks, mark) + { + _mark_free(mark); + } } for (i = 0; i < 7; i++) @@ -427,13 +427,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->calendar, "elm,action,focus", "elm"); - evas_object_focus_set(wd->calendar, EINA_TRUE); + edje_object_signal_emit(wd->calendar, "elm,action,focus", "elm"); + evas_object_focus_set(wd->calendar, EINA_TRUE); } else { - edje_object_signal_emit(wd->calendar, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->calendar, EINA_FALSE); + edje_object_signal_emit(wd->calendar, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->calendar, EINA_FALSE); } } @@ -512,23 +512,23 @@ wd->selected_time.tm_mon += delta; if (wd->selected_time.tm_mon < 0) { - if (wd->selected_time.tm_year == wd->year_min) - { - wd->selected_time.tm_mon++; - return EINA_FALSE; - } - wd->selected_time.tm_mon = 11; - wd->selected_time.tm_year--; + if (wd->selected_time.tm_year == wd->year_min) + { + wd->selected_time.tm_mon++; + return EINA_FALSE; + } + wd->selected_time.tm_mon = 11; + wd->selected_time.tm_year--; } else if (wd->selected_time.tm_mon > 11) { - if (wd->selected_time.tm_year == wd->year_max) - { - wd->selected_time.tm_mon--; - return EINA_FALSE; - } - wd->selected_time.tm_mon = 0; - wd->selected_time.tm_year++; + if (wd->selected_time.tm_year == wd->year_max) + { + wd->selected_time.tm_mon--; + return EINA_FALSE; + } + wd->selected_time.tm_mon = 0; + wd->selected_time.tm_year++; } maxdays = _maxdays_get(&wd->selected_time); @@ -606,7 +606,7 @@ int day; Widget_Data *wd = elm_widget_data_get(obj); if ((!wd) || (!wd->selection_enabled)) - return; + return; day = _get_item_day(obj, sel_it); if (!day) @@ -627,7 +627,7 @@ int sel_it; Widget_Data *wd = elm_widget_data_get(data); if ((!wd) || (!wd->selection_enabled)) - return; + return; sel_it = atoi(source); _update_sel_it(data, sel_it); @@ -636,7 +636,7 @@ static inline int _time_to_next_day(struct tm *t) { - return ((((24 - t->tm_hour) * 60) - t->tm_min) * 60) - t->tm_sec; + return ((((24 - t->tm_hour) * 60) - t->tm_min) * 60) - t->tm_sec; } static Eina_Bool @@ -655,7 +655,7 @@ ecore_timer_interval_set(wd->update_timer, t); if ((wd->current_time.tm_mon != wd->selected_time.tm_mon) || - (wd->current_time.tm_year!= wd->selected_time.tm_year)) + (wd->current_time.tm_year!= wd->selected_time.tm_year)) return ECORE_CALLBACK_RENEW; day = wd->current_time.tm_mday + wd->first_day_it - 1; @@ -729,7 +729,7 @@ Evas *e; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "calendar"); elm_widget_type_set(obj, "calendar"); elm_widget_sub_object_add(parent, obj); @@ -781,7 +781,7 @@ /* If we failed getting day, get a default value */ wd->weekdays[i] = _days_abbrev[i]; WRN("Failed getting weekday name for '%s' from locale.", - _days_abbrev[i]); + _days_abbrev[i]); } weekday += 86400; /* Advance by a day */ } @@ -1228,14 +1228,14 @@ /** * Set a text color to the saturday color. - * + * * Deprecated. use elm_calendar_mark_add() instead like: - * + * * @code * struct tm t = { 0, 0, 12, 6, 0, 0, 5, 5, -1 }; * elm_calendar_mark_add(obj, "sat", &t, ELM_CALENDAR_WEEKLY); * @endcode - * + * * @param obj The calendar object * @param pos The text position * @@ -1244,22 +1244,22 @@ EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - _text_day_color_set(wd, DAY_SATURDAY, pos); + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + _text_day_color_set(wd, DAY_SATURDAY, pos); } /** * Set a text color to the sunday color. * * Deprecated. use elm_calendar_mark_add() instead like: - * + * * @code * struct tm t = { 0, 0, 12, 7, 0, 0, 6, 6, -1 }; * elm_calendar_mark_add(obj, "sun", &t, ELM_CALENDAR_WEEKLY); * @endcode - * + * * @param obj The calendar object * @param pos The text position * @@ -1268,20 +1268,20 @@ EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, int pos) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - _text_day_color_set(wd, DAY_SUNDAY, pos); + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + _text_day_color_set(wd, DAY_SUNDAY, pos); } /** * Set a text color to the weekday color. * * Deprecated. use elm_calendar_mark_add() instead like: - * + * * @code * struct tm t = { 0, 0, 12, 1, 0, 0, 0, 0, -1 }; - * + * * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // monday * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // tuesday @@ -1292,7 +1292,7 @@ * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // friday * @endcode - * + * * @param obj The calendar object * @param pos The text position * @@ -1301,8 +1301,8 @@ EINA_DEPRECATED EAPI void elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - _text_day_color_set(wd, DAY_WEEKDAY, pos); + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + _text_day_color_set(wd, DAY_WEEKDAY, pos); } Modified: trunk/elementary/src/lib/elm_check.c =================================================================== --- trunk/elementary/src/lib/elm_check.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_check.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -48,8 +48,8 @@ static const char SIG_CHANGED[] = "changed"; static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CHANGED, ""}, - {NULL, NULL} + {SIG_CHANGED, ""}, + {NULL, NULL} }; static Eina_Bool @@ -85,13 +85,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->chk, "elm,action,focus", "elm"); - evas_object_focus_set(wd->chk, EINA_TRUE); + edje_object_signal_emit(wd->chk, "elm,action,focus", "elm"); + evas_object_focus_set(wd->chk, EINA_TRUE); } else { - edje_object_signal_emit(wd->chk, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->chk, EINA_FALSE); + edje_object_signal_emit(wd->chk, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->chk, EINA_FALSE); } } @@ -112,20 +112,20 @@ _mirrored_set(obj, elm_widget_mirrored_get(obj)); _elm_theme_object_set(obj, wd->chk, "check", "base", elm_widget_style_get(obj)); if (wd->icon) - edje_object_signal_emit(wd->chk, "elm,state,icon,visible", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,icon,visible", "elm"); else - edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm"); if (wd->state) - edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm"); else - edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm"); if (wd->label) - edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm"); else - edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm"); edje_object_part_text_set(wd->chk, "elm.text", wd->label); if (elm_widget_disabled_get(obj)) - edje_object_signal_emit(wd->chk, "elm,state,disabled", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,disabled", "elm"); edje_object_message_signal_process(wd->chk); edje_object_scale_set(wd->chk, elm_widget_scale_get(obj) * _elm_config->scale); _sizing_eval(obj); @@ -137,9 +137,9 @@ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; if (elm_widget_disabled_get(obj)) - edje_object_signal_emit(wd->chk, "elm,state,disabled", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,disabled", "elm"); else - edje_object_signal_emit(wd->chk, "elm,state,enabled", "elm"); + edje_object_signal_emit(wd->chk, "elm,state,enabled", "elm"); } static void @@ -174,12 +174,12 @@ if (!wd) return; if (sub == wd->icon) { - edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm"); - evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - wd->icon = NULL; - _sizing_eval(obj); - edje_object_message_signal_process(wd->chk); + edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm"); + evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + wd->icon = NULL; + _sizing_eval(obj); + edje_object_message_signal_process(wd->chk); } } @@ -247,7 +247,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "check"); elm_widget_type_set(obj, "check"); elm_widget_sub_object_add(parent, obj); @@ -345,12 +345,12 @@ wd->icon = icon; if (icon) { - elm_widget_sub_object_add(obj, icon); - evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - edje_object_part_swallow(wd->chk, "elm.swallow.content", icon); - edje_object_signal_emit(wd->chk, "elm,state,icon,visible", "elm"); - edje_object_message_signal_process(wd->chk); + elm_widget_sub_object_add(obj, icon); + evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + edje_object_part_swallow(wd->chk, "elm.swallow.content", icon); + edje_object_signal_emit(wd->chk, "elm,state,icon,visible", "elm"); + edje_object_message_signal_process(wd->chk); } _sizing_eval(obj); } @@ -415,12 +415,12 @@ if (!wd) return; if (state != wd->state) { - wd->state = state; - if (wd->statep) *wd->statep = wd->state; - if (wd->state) - edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm"); - else - edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm"); + wd->state = state; + if (wd->statep) *wd->statep = wd->state; + if (wd->state) + edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm"); + else + edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm"); } } @@ -464,15 +464,15 @@ if (!wd) return; if (statep) { - wd->statep = statep; - if (*wd->statep != wd->state) - { - wd->state = *wd->statep; - if (wd->state) - edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm"); - else - edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm"); - } + wd->statep = statep; + if (*wd->statep != wd->state) + { + wd->state = *wd->statep; + if (wd->state) + edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm"); + else + edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm"); + } } else wd->statep = NULL; Modified: trunk/elementary/src/lib/elm_clock.c =================================================================== --- trunk/elementary/src/lib/elm_clock.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_clock.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -31,7 +31,7 @@ Eina_Bool seconds : 1; Eina_Bool am_pm : 1; Eina_Bool edit : 1; - Elm_Clock_Digedit digedit; + Elm_Clock_Digedit digedit; } cur; }; @@ -52,7 +52,7 @@ int i; for (i = 0; i < 6; i++) { - if (wd->digit[i]) evas_object_del(wd->digit[i]); + if (wd->digit[i]) evas_object_del(wd->digit[i]); } if (wd->ampm) evas_object_del(wd->ampm); if (wd->ticker) ecore_timer_del(wd->ticker); @@ -80,13 +80,13 @@ if (!wd) return; if (elm_widget_focus_get(obj)) { - edje_object_signal_emit(wd->clk, "elm,action,focus", "elm"); - evas_object_focus_set(wd->clk, EINA_TRUE); + edje_object_signal_emit(wd->clk, "elm,action,focus", "elm"); + evas_object_focus_set(wd->clk, EINA_TRUE); } else { - edje_object_signal_emit(wd->clk, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->clk, EINA_FALSE); + edje_object_signal_emit(wd->clk, "elm,action,unfocus", "elm"); + evas_object_focus_set(wd->clk, EINA_FALSE); } } @@ -99,8 +99,8 @@ edje_object_signal_emit(wd->clk, emission, source); for (i = 0; i < 6; i++) { - if (wd->digit[i]) - edje_object_signal_emit(wd->digit[i], emission, source); + if (wd->digit[i]) + edje_object_signal_emit(wd->digit[i], emission, source); } } @@ -113,9 +113,9 @@ edje_object_signal_callback_add(wd->clk, emission, source, func_cb, data); for (i = 0; i < 6; i++) { - if (wd->digit[i]) - edje_object_signal_callback_add(wd->digit[i], emission, source, - func_cb, data); + if (wd->digit[i]) + edje_object_signal_callback_add(wd->digit[i], emission, source, + func_cb, data); } } @@ -126,7 +126,7 @@ int i; for (i = 0; i < 6; i++) { - edje_object_signal_callback_del_full(wd->digit[i], emission, source, + edje_object_signal_callback_del_full(wd->digit[i], emission, source, func_cb, data); } edje_object_signal_callback_del_full(wd->clk, emission, source, func_cb, @@ -144,7 +144,7 @@ tzset(); tm = localtime(&tt); wd->timediff = (((wd->hrs - tm->tm_hour) * 60 + - wd->min - tm->tm_min) * 60) + wd->sec - tm->tm_sec; + wd->min - tm->tm_min) * 60) + wd->sec - tm->tm_sec; } static Eina_Bool @@ -161,16 +161,16 @@ wd->ticker = ecore_timer_add(t, _ticker, data); if (!wd->edit) { - tt = (time_t)(timev.tv_sec) + wd->timediff; - tzset(); - tm = localtime(&tt); - if (tm) - { - wd->hrs = tm->tm_hour; - wd->min = tm->tm_min; - wd->sec = tm->tm_sec; - _time_update(data); - } + tt = (time_t)(timev.tv_sec) + wd->timediff; + tzset(); + tm = localtime(&tt); + if (tm) + { + wd->hrs = tm->tm_hour; + wd->min = tm->tm_min; + wd->sec = tm->tm_sec; + _time_update(data); + } } return ECORE_CALLBACK_CANCEL; } @@ -184,38 +184,38 @@ if (!wd->sel_obj) goto clock_val_up_cancel; if (wd->sel_obj == wd->digit[0]) { - wd->hrs = wd->hrs + 10; - if (wd->hrs >= 24) wd->hrs -= 24; + wd->hrs = wd->hrs + 10; + if (wd->hrs >= 24) wd->hrs -= 24; } if (wd->sel_obj == wd->digit[1]) { - wd->hrs = wd->hrs + 1; - if (wd->hrs >= 24) wd->hrs -= 24; + wd->hrs = wd->hrs + 1; + if (wd->hrs >= 24) wd->hrs -= 24; } if (wd->sel_obj == wd->digit[2]) { - wd->min = wd->min + 10; - if (wd->min >= 60) wd->min -= 60; + wd->min = wd->min + 10; + if (wd->min >= 60) wd->min -= 60; } if (wd->sel_obj == wd->digit[3]) { - wd->min = wd->min + 1; - if (wd->min >= 60) wd->min -= 60; + wd->min = wd->min + 1; + if (wd->min >= 60) wd->min -= 60; } if (wd->sel_obj == wd->digit[4]) { - wd->sec = wd->sec + 10; - if (wd->sec >= 60) wd->sec -= 60; + wd->sec = wd->sec + 10; + if (wd->sec >= 60) wd->sec -= 60; } if (wd->sel_obj == wd->digit[5]) { - wd->sec = wd->sec + 1; - if (wd->sec >= 60) wd->sec -= 60; + wd->sec = wd->sec + 1; + if (wd->sec >= 60) wd->sec -= 60; } if (wd->sel_obj == wd->ampm) { - wd->hrs = wd->hrs + 12; - if (wd->hrs > 23) wd->hrs -= 24; + wd->hrs = wd->hrs + 12; + if (wd->hrs > 23) wd->hrs -= 24; } wd->interval = wd->interval / 1.05; ecore_timer_interval_set(wd->spin, wd->interval); @@ -237,38 +237,38 @@ if (!wd->sel_obj) goto clock_val_down_cancel; if (wd->sel_obj == wd->digit[0]) { - wd->hrs = wd->hrs - 10; - if (wd->hrs < 0) wd->hrs += 24; + wd->hrs = wd->hrs - 10; + if (wd->hrs < 0) wd->hrs += 24; } if (wd->sel_obj == wd->digit[1]) { - wd->hrs = wd->hrs - 1; - if (wd->hrs < 0) wd->hrs += 24; + wd->hrs = wd->hrs - 1; + if (wd->hrs < 0) wd->hrs += 24; } if (wd->sel_obj == wd->digit[2]) { - wd->min = wd->min - 10; - if (wd->min < 0) wd->min += 60; + wd->min = wd->min - 10; + if (wd->min < 0) wd->min += 60; } if (wd->sel_obj == wd->digit[3]) { - wd->min = wd->min - 1; - if (wd->min < 0) wd->min += 60; + wd->min = wd->min - 1; + if (wd->min < 0) wd->min += 60; } if (wd->sel_obj == wd->digit[4]) { - wd->sec = wd->sec - 10; - if (wd->sec < 0) wd->sec += 60; + wd->sec = wd->sec - 10; + if (wd->sec < 0) wd->sec += 60; } if (wd->sel_obj == wd->digit[5]) { - wd->sec = wd->sec - 1; - if (wd->sec < 0) wd->sec += 60; + wd->sec = wd->sec - 1; + if (wd->sec < 0) wd->sec += 60; } if (wd->sel_obj == wd->ampm) { - wd->hrs = wd->hrs - 12; - if (wd->hrs < 0) wd->hrs += 24; + wd->hrs = wd->hrs - 12; + if (wd->hrs < 0) wd->hrs += 24; } wd->interval = wd->interval / 1.05; ecore_timer_interval_set(wd->spin, wd->interval); @@ -326,188 +326,188 @@ if ((wd->cur.seconds != wd->seconds) || (wd->cur.am_pm != wd->am_pm) || (wd->cur.edit != wd->edit) || (wd->cur.digedit != wd->digedit)) { - int i; - Evas_Coord mw, mh; + int i; + Evas_Coord mw, mh; - for (i = 0; i < 6; i++) - { - if (wd->digit[i]) - { - evas_object_del(wd->digit[i]); - wd->digit[i] = NULL; - } - } - if (wd->ampm) - { - evas_object_del(wd->ampm); - wd->ampm = NULL; - } + for (i = 0; i < 6; i++) + { + if (wd->digit[i]) + { + evas_object_del(wd->digit[i]); + wd->digit[i] = NULL; + } + } + if (wd->ampm) + { + evas_object_del(wd->ampm); + wd->ampm = NULL; + } - if ((wd->seconds) && (wd->am_pm)) - _elm_theme_object_set(obj, wd->clk, "clock", "base-all", style); - else if (wd->seconds) - _elm_theme_object_set(obj, wd->clk, "clock", "base-seconds", style); - else if (wd->am_pm) - _elm_theme_object_set(obj, wd->clk, "clock", "base-am_pm", style); - else - _elm_theme_object_set(obj, wd->clk, "clock", "base", style); - edje_object_scale_set(wd->clk, elm_widget_scale_get(obj) * + if ((wd->seconds) && (wd->am_pm)) + _elm_theme_object_set(obj, wd->clk, "clock", "base-all", style); + else if (wd->seconds) + _elm_theme_object_set(obj, wd->clk, "clock", "base-seconds", style); + else if (wd->am_pm) + _elm_theme_object_set(obj, wd->clk, "clock", "base-am_pm", style); + else + _elm_theme_object_set(obj, wd->clk, "clock", "base", style); + edje_object_scale_set(wd->clk, elm_widget_scale_get(obj) * _elm_config->scale); - for (i = 0; i < 6; i++) - { - char buf[16]; + for (i = 0; i < 6; i++) + { + char buf[16]; - if ((!wd->seconds) && (i >= 4)) break; - wd->digit[i] = edje_object_add(evas_object_evas_get(wd->clk)); - _elm_theme_object_set(obj, wd->digit[i], "clock", "flipdigit", style); - edje_object_scale_set(wd->digit[i], elm_widget_scale_get(obj) * + if ((!wd->seconds) && (i >= 4)) break; + wd->digit[i] = edje_object_add(evas_object_evas_get(wd->clk)); + _elm_theme_object_set(obj, wd->digit[i], "clock", "flipdigit", style); + edje_object_scale_set(wd->digit[i], elm_widget_scale_get(obj) * _elm_config->scale); - if ((wd->edit) && (wd->digedit & (1 << i))) - edje_object_signal_emit(wd->digit[i], "elm,state,edit,on", "elm"); - edje_object_signal_callback_add(wd->digit[i], "elm,action,up,start", - "", _signal_clock_val_up_start, obj); - edje_object_signal_callback_add(wd->digit[i], "elm,action,up,stop", - "", _signal_clock_val_change_stop, obj); - edje_object_signal_callback_add(wd->digit[i], "elm,action,down,start", - "", _signal_clock_val_down_start, obj); - edje_object_signal_callback_add(wd->digit[i], "elm,action,down,stop", - "", _signal_clock_val_change_stop, obj); - mw = mh = -1; - elm_coords_finger_size_adjust(1, &mw, 2, &mh); - edje_object_size_min_restricted_calc(wd->digit[i], &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 2, &mh); - edje_extern_object_min_size_set(wd->digit[i], mw, mh); - snprintf(buf, sizeof(buf), "d%i", i); - edje_object_part_swallow(wd->clk , buf, wd->digit[i]); - evas_object_show(wd->digit[i]); - } - if (wd->am_pm) - { - wd->ampm = edje_object_add(evas_object_evas_get(wd->clk)); - _elm_theme_object_set(obj, wd->ampm, "clock", "flipampm", style); - edje_object_scale_set(wd->ampm, elm_widget_scale_get(obj) * + if ((wd->edit) && (wd->digedit & (1 << i))) + edje_object_signal_emit(wd->digit[i], "elm,state,edit,on", "elm"); + edje_object_signal_callback_add(wd->digit[i], "elm,action,up,start", + "", _signal_clock_val_up_start, obj); + edje_object_signal_callback_add(wd->digit[i], "elm,action,up,stop", + "", _signal_clock_val_change_stop, obj); + edje_object_signal_callback_add(wd->digit[i], "elm,action,down,start", + "", _signal_clock_val_down_start, obj); + edje_object_signal_callback_add(wd->digit[i], "elm,action,down,stop", + "", _signal_clock_val_change_stop, obj); + mw = mh = -1; + elm_coords_finger_size_adjust(1, &mw, 2, &mh); + edje_object_size_min_restricted_calc(wd->digit[i], &mw, &mh, mw, mh); + elm_coords_finger_size_adjust(1, &mw, 2, &mh); + edje_extern_object_min_size_set(wd->digit[i], mw, mh); + snprintf(buf, sizeof(buf), "d%i", i); + edje_object_part_swallow(wd->clk , buf, wd->digit[i]); + evas_object_show(wd->digit[i]); + } + if (wd->am_pm) + { + wd->ampm = edje_object_add(evas_object_evas_get(wd->clk)); + _elm_theme_object_set(obj, wd->ampm, "clock", "flipampm", style); + 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,start", - "", _signal_clock_val_up_start, obj); - edje_object_signal_callback_add(wd->ampm, "elm,action,up,stop", - "", _signal_clock_val_change_stop, obj); - edje_object_signal_callback_add(wd->ampm, "elm,action,down,start", - "", _signal_clock_val_down_start, obj); - edje_object_signal_callback_add(wd->ampm, "elm,action,down,stop", - "", _signal_clock_val_change_stop, obj); - mw = mh = -1; - elm_coords_finger_size_adjust(1, &mw, 2, &mh); - edje_object_size_min_restricted_calc(wd->ampm, &mw, &mh, mw, mh); - elm_coords_finger_size_adjust(1, &mw, 2, &mh); - edje_extern_object_min_size_set(wd->ampm, mw, mh); - edje_object_part_swallow(wd->clk , "ampm", wd->ampm); - evas_object_show(wd->ampm); - } + if (wd->edit) + edje_object_signal_emit(wd->ampm, "elm,state,edit,on", "elm"); + edje_object_signal_callback_add(wd->ampm, "elm,action,up,start", + "", _signal_clock_val_up_start, obj); + edje_object_signal_callback_add(wd->ampm, "elm,action,up,stop", + "", _signal_clock_val_change_stop, obj); + edje_object_signal_callback_add(wd->ampm, "elm,action,down,start", + "", _signal_clock_val_down_start, obj); + edje_object_signal_callback_add(wd->ampm, "elm,action,down,stop", + "", _signal_clock_val_change_stop, obj); + mw = mh = -1; + elm_coords_finger_size_adjust(1, &mw, 2, &mh); + edje_object_size_min_restricted_calc(wd->ampm, &mw, &mh, mw, mh); + elm_coords_finger_size_adjust(1, &mw, 2, &mh); + edje_extern_object_min_size_set(wd->ampm, mw, mh); + edje_object_part_swallow(wd->clk , "ampm", wd->ampm); + evas_object_show(wd->ampm); + } - edje_object_size_min_calc(wd->clk, &mw, &mh); - evas_object_size_hint_min_set(obj, mw, mh); + edje_object_size_min_calc(wd->clk, &mw, &mh); + evas_object_size_hint_min_set(obj, mw, mh); - wd->cur.hrs = 0; - wd->cur.min = 0; - wd->cur.sec = 0; - wd->cur.ampm = -1; - wd->cur.seconds = wd->seconds; - wd->cur.am_pm = wd->am_pm; - wd->cur.edit = wd->edit; - wd->cur.digedit = wd->digedit; + wd->cur.hrs = 0; + wd->cur.min = 0; + wd->cur.sec = 0; + wd->cur.ampm = -1; + wd->cur.seconds = wd->seconds; + wd->cur.am_pm = wd->am_pm; + wd->cur.edit = wd->edit; + wd->cur.digedit = wd->digedit; } if (wd->hrs != wd->cur.hrs) { - int hrs; - int d1, d2, dc1, dc2; + int hrs; + int d1, d2, dc1, dc2; - hrs = wd->hrs; - if (wd->am_pm) - { - if (hrs >= 12) - { - if (hrs > 12) hrs -= 12; - ampm = 1; - } - else if (!hrs) hrs = 12; - } - d1 = hrs / 10; - d2 = hrs % 10; - dc1 = wd->cur.hrs / 10; - dc2 = wd->cur.hrs % 10; - if (d1 != dc1) - { - msg.val = d1; - edje_object_message_send(wd->digit[0], EDJE_MESSAGE_INT, 1, &msg); - } - if (d2 != dc2) - { - msg.val = d2; - edje_object_message_send(wd->digit[1], EDJE_MESSAGE_INT, 1, &msg); - } - wd->cur.hrs = hrs; + hrs = wd->hrs; + if (wd->am_pm) + { + if (hrs >= 12) + { + if (hrs > 12) hrs -= 12; + ampm = 1; + } + else if (!hrs) hrs = 12; + } + d1 = hrs / 10; + d2 = hrs % 10; + dc1 = wd->cur.hrs / 10; + dc2 = wd->cur.hrs % 10; + if (d1 != dc1) + { + msg.val = d1; + edje_object_message_send(wd->digit[0], EDJE_MESSAGE_INT, 1, &msg); + } + if (d2 != dc2) + { + msg.val = d2; + edje_object_message_send(wd->digit[1], EDJE_MESSAGE_INT, 1, &msg); + } + wd->cur.hrs = hrs; } if (wd->min != wd->cur.min) { - int d1, d2, dc1, dc2; + int d1, d2, dc1, dc2; - d1 = wd->min / 10; - d2 = wd->min % 10; - dc1 = wd->cur.min / 10; - dc2 = wd->cur.min % 10; - if (d1 != dc1) - { - msg.val = d1; - edje_object_message_send(wd->digit[2], EDJE_MESSAGE_INT, 1, &msg); - } - if (d2 != dc2) - { - msg.val = d2; - edje_object_message_send(wd->digit[3], EDJE_MESSAGE_INT, 1, &msg); - } - wd->cur.min = wd->min; + d1 = wd->min / 10; + d2 = wd->min % 10; + dc1 = wd->cur.min / 10; + dc2 = wd->cur.min % 10; + if (d1 != dc1) + { + msg.val = d1; + edje_object_message_send(wd->digit[2], EDJE_MESSAGE_INT, 1, &msg); + } + if (d2 != dc2) + { + msg.val = d2; + edje_object_message_send(wd->digit[3], EDJE_MESSAGE_INT, 1, &msg); + } + wd->cur.min = wd->min; } if (wd->seconds) { - if (wd->sec != wd->cur.sec) - { - int d1, d2, dc1, dc2; + if (wd->sec != wd->cur.sec) + { + int d1, d2, dc1, dc2; - d1 = wd->sec / 10; - d2 = wd->sec % 10; - dc1 = wd->cur.sec / 10; - dc2 = wd->cur.sec % 10; - if (d1 != dc1) - { - msg.val = d1; - edje_object_message_send(wd->digit[4], EDJE_MESSAGE_INT, 1, &msg); - } - if (d2 != dc2) - { - msg.val = d2; - edje_object_message_send(wd->digit[5], EDJE_MESSAGE_INT, 1, &msg); - } - wd->cur.sec = wd->sec; - } + d1 = wd->sec / 10; + d2 = wd->sec % 10; + dc1 = wd->cur.sec / 10; + dc2 = wd->cur.sec % 10; + if (d1 != dc1) + { + msg.val = d1; + edje_object_message_send(wd->digit[4], EDJE_MESSAGE_INT, 1, &msg); + } + if (d2 != dc2) + { + msg.val = d2; + edje_object_message_send(wd->digit[5], EDJE_MESSAGE_INT, 1, &msg); + } + wd->cur.sec = wd->sec; + } } else wd->cur.sec = -1; if (wd->am_pm) { - if (wd->hrs >= 12) ampm = 1; - if (ampm != wd->cur.ampm) - { - if (wd->cur.ampm != ampm) - { - msg.val = ampm; - edje_object_message_send(wd->ampm, EDJE_MESSAGE_INT, 1, &msg); - } - wd->cur.ampm = ampm; - } + if (wd->hrs >= 12) ampm = 1; + if (ampm != wd->cur.ampm) + { + if (wd->cur.ampm != ampm) + { + msg.val = ampm; + edje_object_message_send(wd->ampm, EDJE_MESSAGE_INT, 1, &msg); + } + wd->cur.ampm = ampm; + } } else wd->cur.ampm = -1; @@ -531,7 +531,7 @@ Widget_Data *wd; ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - + ELM_SET_WIDTYPE(widtype, "clock"); elm_widget_type_set(obj, "clock"); elm_widget_sub_object_add(parent, obj); Modified: trunk/elementary/src/lib/elm_cnp_helper.c =================================================================== --- trunk/elementary/src/lib/elm_cnp_helper.c 2011-04-01 11:32:33 UTC (rev 58252) +++ trunk/elementary/src/lib/elm_cnp_helper.c 2011-04-01 11:35:07 UTC (rev 58253) @@ -56,7 +56,7 @@ CNP_ATOM_TEXT, CNP_ATOM_text_plain_utf8, CNP_ATOM_text_plain, - + CNP_N_ATOMS, }; @@ -83,7 +83,7 @@ Elm_Sel_Format format; Ecore_X_Selection ecore_sel; - + Eina_Bool active : 1; }; @@ -168,212 +168,212 @@ /* Optimisation: Turn this into a 256 byte table: * then can lookup in one index, not N checks */ static const Escape escapes[] = { - { "<br>", '\n' }, - { "<\t>", '\t' }, - { "gt;", '>' }, - { "lt;", '<' }, - { "amp;", '&' }, - { "quot;", '\'' }, - { "dquot;", '"' } + { "<br>", '\n' }, + { "<\t>", '\t' }, + { "gt;", '>' }, + { "lt;", '<' }, + { "amp;", '&' }, + { "quot;", '\'' }, + { "dquot;", '"' } }; #define N_ESCAPES ((int)(sizeof(escapes) / sizeof(escapes[0]))) static Cnp_Atom atoms[CNP_N_ATOMS] = { - [CNP_ATOM_TARGETS] = { - "TARGETS", - (Elm_Sel_Format) -1, // everything - targets_converter, - response_handler_targets, - notify_handler_targets, - 0 - }, - [CNP_ATOM_XELM] = { - "application/x-elementary-markup", - ELM_SEL_FORMAT_MARKUP, - edje_converter, - NULL, - NULL, - 0 - }, - [CNP_ATOM_text_uri] = { - "text/uri", - ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE, /* Either images or entries */ - uri_converter, - NULL, - notify_handler_uri, - 0 - }, - [CNP_ATOM_text_urilist] = { - "text/uri-list", - ELM_SEL_FORMAT_IMAGE, - uri_converter, -... [truncated message content] |