From: Enlightenment S. <no-...@en...> - 2012-06-26 03:44:37
|
Log: edje: destroy child and group correctly. Author: cedric Date: 2012-06-25 20:44:30 -0700 (Mon, 25 Jun 2012) New Revision: 72838 Trac: http://trac.enlightenment.org/e/changeset/72838 Modified: trunk/edje/src/lib/edje_load.c Modified: trunk/edje/src/lib/edje_load.c =================================================================== --- trunk/edje/src/lib/edje_load.c 2012-06-26 01:38:48 UTC (rev 72837) +++ trunk/edje/src/lib/edje_load.c 2012-06-26 03:44:30 UTC (rev 72838) @@ -1139,7 +1139,6 @@ } if (rp->swallowed_object) { - _edje_real_part_swallow_clear(rp); /* Objects swallowed by the app do not get deleted, but those internally swallowed (GROUP type) do. */ switch (rp->part->type) @@ -1153,6 +1152,7 @@ default: break; } + _edje_real_part_swallow_clear(rp); rp->swallowed_object = NULL; } if (rp->items) |
From: Enlightenment S. <no-...@en...> - 2012-07-11 09:26:49
|
Log: edje: little bug fixes when rp could have been already destroyed. Author: cedric Date: 2012-07-11 02:26:37 -0700 (Wed, 11 Jul 2012) New Revision: 73556 Trac: http://trac.enlightenment.org/e/changeset/73556 Modified: trunk/edje/src/lib/edje_util.c Modified: trunk/edje/src/lib/edje_util.c =================================================================== --- trunk/edje/src/lib/edje_util.c 2012-07-11 08:50:52 UTC (rev 73555) +++ trunk/edje/src/lib/edje_util.c 2012-07-11 09:26:37 UTC (rev 73556) @@ -91,18 +91,21 @@ case EDJE_USER_SWALLOW: child = eud->u.swallow.child; rp = _edje_real_part_recursive_get(eud->ed, eud->part); - _edje_real_part_swallow_clear(rp); - rp->swallowed_object = NULL; - rp->swallow_params.min.w = 0; - rp->swallow_params.min.h = 0; - rp->swallow_params.max.w = 0; - rp->swallow_params.max.h = 0; - rp->edje->dirty = 1; - rp->edje->recalc_call = 1; + if (rp) + { + _edje_real_part_swallow_clear(rp); + rp->swallowed_object = NULL; + rp->swallow_params.min.w = 0; + rp->swallow_params.min.h = 0; + rp->swallow_params.max.w = 0; + rp->swallow_params.max.h = 0; + rp->edje->dirty = 1; + rp->edje->recalc_call = 1; #ifdef EDJE_CALC_CACHE - rp->invalidate = 1; + rp->invalidate = 1; #endif - _edje_recalc_do(rp->edje); + _edje_recalc_do(rp->edje); + } break; case EDJE_USER_BOX_PACK: child = eud->u.box.child; |
From: Enlightenment S. <no-...@en...> - 2012-07-11 10:50:41
|
Log: edje: cleanup and make limit per description work. Author: cedric Date: 2012-07-11 03:50:30 -0700 (Wed, 11 Jul 2012) New Revision: 73562 Trac: http://trac.enlightenment.org/e/changeset/73562 Modified: trunk/edje/src/lib/edje_calc.c trunk/edje/src/lib/edje_private.h Modified: trunk/edje/src/lib/edje_calc.c =================================================================== --- trunk/edje/src/lib/edje_calc.c 2012-07-11 10:08:46 UTC (rev 73561) +++ trunk/edje/src/lib/edje_calc.c 2012-07-11 10:50:30 UTC (rev 73562) @@ -676,66 +676,64 @@ unsigned char limit; int part; - name = ed->collection->parts[i]->name; part = ed->collection->limits.parts[i].part; + name = ed->collection->parts[part]->name; limit = ed->table_parts[part]->chosen_description->limit; switch (limit) { case 0: - ed->collection->limits.parts[i].width = 2; - ed->collection->limits.parts[i].height = 2; + ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN; + ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN; break; case 1: - ed->collection->limits.parts[i].height = 2; + ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN; break; case 2: - ed->collection->limits.parts[i].width = 2; + ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN; break; case 3: break; } - if (limit | 1) + if ((limit & 1) == 1) { if (ed->table_parts[part]->w > 0 && - (ed->collection->limits.parts[i].width <= 0 || - ed->collection->limits.parts[i].width == 2)) + (ed->collection->limits.parts[i].width != EDJE_PART_LIMIT_OVER)) { - ed->collection->limits.parts[i].width = 1; + ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_OVER; _edje_emit(ed, "limit,width,over", name); } else if (ed->table_parts[part]->w < 0 && - ed->collection->limits.parts[i].width >= 0) + ed->collection->limits.parts[i].width != EDJE_PART_LIMIT_BELOW) { - ed->collection->limits.parts[i].width = -1; + ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_BELOW; _edje_emit(ed, "limit,width,below", name); } else if (ed->table_parts[part]->w == 0 && - ed->collection->limits.parts[i].width != 0) + ed->collection->limits.parts[i].width != EDJE_PART_LIMIT_ZERO) { - ed->collection->limits.parts[i].width = 0; + ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_ZERO; _edje_emit(ed, "limit,width,zero", name); } } - if (limit | 2) + if ((limit & 2) == 2) { if (ed->table_parts[part]->h > 0 && - (ed->collection->limits.parts[i].height <= 0 || - ed->collection->limits.parts[i].height == 2)) + (ed->collection->limits.parts[i].height != EDJE_PART_LIMIT_OVER)) { - ed->collection->limits.parts[i].height = 1; + ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_OVER; _edje_emit(ed, "limit,height,over", name); } else if (ed->table_parts[part]->h < 0 && - ed->collection->limits.parts[i].height >= 0) + ed->collection->limits.parts[i].height != EDJE_PART_LIMIT_BELOW) { - ed->collection->limits.parts[i].height = -1; - _edje_emit(ed, "limit,height,beloh", name); + ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_BELOW; + _edje_emit(ed, "limit,height,below", name); } else if (ed->table_parts[part]->h == 0 && - ed->collection->limits.parts[i].height != 0) + ed->collection->limits.parts[i].height != EDJE_PART_LIMIT_ZERO) { - ed->collection->limits.parts[i].height = 0; + ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_ZERO; _edje_emit(ed, "limit,height,zero", name); } } Modified: trunk/edje/src/lib/edje_private.h =================================================================== --- trunk/edje/src/lib/edje_private.h 2012-07-11 10:08:46 UTC (rev 73561) +++ trunk/edje/src/lib/edje_private.h 2012-07-11 10:50:30 UTC (rev 73562) @@ -727,12 +727,19 @@ unsigned short colspan, rowspan; }; +typedef enum { + EDJE_PART_LIMIT_UNKNOWN = 0, + EDJE_PART_LIMIT_BELOW, + EDJE_PART_LIMIT_ZERO, + EDJE_PART_LIMIT_OVER +} Edje_Part_Limit_State; + struct _Edje_Part_Limit { int part; - signed char width; /* -1, 0 or 1 */ - signed char height; /* -1, 0, or 1 */ + Edje_Part_Limit_State width; /* -1, 0 or 1 */ + Edje_Part_Limit_State height; /* -1, 0, or 1 */ }; /*----------*/ |
From: Enlightenment S. <no-...@en...> - 2012-07-20 02:12:15
|
Log: edje: remove dead code. Author: cedric Date: 2012-07-19 19:12:06 -0700 (Thu, 19 Jul 2012) New Revision: 74199 Trac: http://trac.enlightenment.org/e/changeset/74199 Modified: trunk/edje/src/lib/edje_program.c Modified: trunk/edje/src/lib/edje_program.c =================================================================== --- trunk/edje/src/lib/edje_program.c 2012-07-20 01:38:09 UTC (rev 74198) +++ trunk/edje/src/lib/edje_program.c 2012-07-20 02:12:06 UTC (rev 74199) @@ -1162,16 +1162,6 @@ } pr->exec = exec; -#if 0 - if (exec) - { - _edje_program_run(ed, pr, 0, sig, src); - if (_edje_block_break(ed)) - { - goto break_prog; - } - } -#endif } EINA_LIST_FOREACH(matches, l, pr) |
From: Enlightenment S. <no-...@en...> - 2012-08-21 03:06:52
|
Log: edje: fix fixed point issue. Author: cedric Date: 2012-08-20 20:06:44 -0700 (Mon, 20 Aug 2012) New Revision: 75484 Trac: http://trac.enlightenment.org/e/changeset/75484 Modified: trunk/edje/src/lib/edje_entry.c Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2012-08-21 02:46:17 UTC (rev 75483) +++ trunk/edje/src/lib/edje_entry.c 2012-08-21 03:06:44 UTC (rev 75484) @@ -1662,7 +1662,7 @@ ecore_timer_del(en->pw_timer); en->pw_timer = NULL; } - en->pw_timer = ecore_timer_add(_edje_password_show_last_timeout, + en->pw_timer = ecore_timer_add(TO_DOUBLE(_edje_password_show_last_timeout), _password_timer_cb, en); } else @@ -3405,7 +3405,7 @@ ecore_timer_del(en->pw_timer); en->pw_timer = NULL; } - en->pw_timer = ecore_timer_add(_edje_password_show_last_timeout, + en->pw_timer = ecore_timer_add(TO_DOUBLE(_edje_password_show_last_timeout), _password_timer_cb, en); } else @@ -3514,7 +3514,7 @@ ecore_timer_del(en->pw_timer); en->pw_timer = NULL; } - en->pw_timer = ecore_timer_add(_edje_password_show_last_timeout, + en->pw_timer = ecore_timer_add(TO_DOUBLE(_edje_password_show_last_timeout), _password_timer_cb, en); } else |
From: Enlightenment S. <no-...@en...> - 2012-08-29 05:50:25
|
Log: edje: fix a leak when propagating signal to GROUP part. Author: cedric Date: 2012-08-28 22:50:14 -0700 (Tue, 28 Aug 2012) New Revision: 75808 Trac: http://trac.enlightenment.org/e/changeset/75808 Modified: trunk/edje/src/lib/edje_load.c trunk/edje/src/lib/edje_message_queue.c trunk/edje/src/lib/edje_private.h Modified: trunk/edje/src/lib/edje_load.c =================================================================== --- trunk/edje/src/lib/edje_load.c 2012-08-29 05:18:27 UTC (rev 75807) +++ trunk/edje/src/lib/edje_load.c 2012-08-29 05:50:14 UTC (rev 75808) @@ -808,6 +808,7 @@ obj); if (rp->part->type == EDJE_PART_TYPE_GROUP) { + ed->groups = eina_list_append(ed->groups, _edje_fetch(child_obj)); _edje_real_part_swallow(rp, child_obj, EINA_TRUE); _edje_subobj_register(ed, child_obj); source = NULL; @@ -1088,6 +1089,8 @@ if (ed->obj) tev = evas_object_evas_get(ed->obj); + ed->groups = eina_list_free(ed->groups); + if (tev) evas_event_freeze(tev); if (ed->freeze_calc) { Modified: trunk/edje/src/lib/edje_message_queue.c =================================================================== --- trunk/edje/src/lib/edje_message_queue.c 2012-08-29 05:18:27 UTC (rev 75807) +++ trunk/edje/src/lib/edje_message_queue.c 2012-08-29 05:50:14 UTC (rev 75808) @@ -63,17 +63,8 @@ ed = _edje_fetch(obj); if (!ed) return; - groups = eina_list_append(groups, ed); - for (i = 0; i < ed->table_parts_size; i++) - { - Edje_Real_Part *rp; + groups = ed->groups; - rp = ed->table_parts[i]; - if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object) - groups = eina_list_append(groups, - _edje_fetch(rp->swallowed_object)); - } - EINA_LIST_FOREACH_SAFE(msgq, l, ln, em) { EINA_LIST_FOREACH(groups, lg, lookup_ed) Modified: trunk/edje/src/lib/edje_private.h =================================================================== --- trunk/edje/src/lib/edje_private.h 2012-08-29 05:18:27 UTC (rev 75807) +++ trunk/edje/src/lib/edje_private.h 2012-08-29 05:50:14 UTC (rev 75808) @@ -1140,6 +1140,8 @@ int table_programs_size; unsigned int table_parts_size; + Eina_List *groups; + struct { Eina_Hash *text_class; Eina_Hash *color_class; |
From: Enlightenment S. <no-...@en...> - 2012-08-29 07:42:23
|
Log: edje: oopsie. Author: cedric Date: 2012-08-29 00:42:15 -0700 (Wed, 29 Aug 2012) New Revision: 75817 Trac: http://trac.enlightenment.org/e/changeset/75817 Modified: trunk/edje/src/lib/edje_load.c Modified: trunk/edje/src/lib/edje_load.c =================================================================== --- trunk/edje/src/lib/edje_load.c 2012-08-29 07:29:21 UTC (rev 75816) +++ trunk/edje/src/lib/edje_load.c 2012-08-29 07:42:15 UTC (rev 75817) @@ -365,6 +365,8 @@ ed->is_rtl = (ed->collection->prop.orientation == EDJE_ORIENTATION_RTL); + ed->groups = eina_list_append(ed->groups, ed); + if (ed->collection->script_only) { ed->load_error = EDJE_LOAD_ERROR_NONE; |
From: Enlightenment S. <no-...@en...> - 2012-09-06 10:01:55
|
Log: edje: check NULL :-) Author: cedric Date: 2012-09-06 03:01:44 -0700 (Thu, 06 Sep 2012) New Revision: 76234 Trac: http://trac.enlightenment.org/e/changeset/76234 Modified: trunk/edje/src/lib/edje_util.c Modified: trunk/edje/src/lib/edje_util.c =================================================================== --- trunk/edje/src/lib/edje_util.c 2012-09-06 09:28:53 UTC (rev 76233) +++ trunk/edje/src/lib/edje_util.c 2012-09-06 10:01:44 UTC (rev 76234) @@ -5083,7 +5083,9 @@ rp); //If the map is enabled, uv should be updated when image size is changed. - if (!strcmp(evas_object_type_get(rp->swallowed_object), "image")) + if (rp->swallowed_object && + evas_object_type_get(rp->swallowed_object) && + !strcmp(evas_object_type_get(rp->swallowed_object), "image")) evas_object_event_callback_add(obj_swallow, EVAS_CALLBACK_IMAGE_RESIZE, _edje_object_part_swallow_image_resize_cb, rp); |
From: Enlightenment S. <no-...@en...> - 2012-09-06 10:05:44
|
Log: edje: correct NULL check. Happy SeoZ :-) Author: cedric Date: 2012-09-06 03:05:34 -0700 (Thu, 06 Sep 2012) New Revision: 76235 Trac: http://trac.enlightenment.org/e/changeset/76235 Modified: trunk/edje/src/lib/edje_util.c Modified: trunk/edje/src/lib/edje_util.c =================================================================== --- trunk/edje/src/lib/edje_util.c 2012-09-06 10:01:44 UTC (rev 76234) +++ trunk/edje/src/lib/edje_util.c 2012-09-06 10:05:34 UTC (rev 76235) @@ -5083,9 +5083,7 @@ rp); //If the map is enabled, uv should be updated when image size is changed. - if (rp->swallowed_object && - evas_object_type_get(rp->swallowed_object) && - !strcmp(evas_object_type_get(rp->swallowed_object), "image")) + if (!strcmp(evas_object_type_get(rp->swallowed_object), "image")) evas_object_event_callback_add(obj_swallow, EVAS_CALLBACK_IMAGE_RESIZE, _edje_object_part_swallow_image_resize_cb, rp); @@ -5118,6 +5116,7 @@ void _edje_real_part_swallow_clear(Edje_Real_Part *rp) { + if (!rp->swallowed_object) return ; evas_object_smart_member_del(rp->swallowed_object); evas_object_event_callback_del_full(rp->swallowed_object, EVAS_CALLBACK_DEL, |
From: Enlightenment S. <no-...@en...> - 2012-10-16 09:43:37
|
Log: edje: fix visibility issue. Author: cedric Date: 2012-10-16 02:43:26 -0700 (Tue, 16 Oct 2012) New Revision: 78044 Trac: http://trac.enlightenment.org/e/changeset/78044 Modified: trunk/edje/src/lib/edje_cache.c trunk/edje/src/lib/edje_data.c trunk/edje/src/lib/edje_private.h Modified: trunk/edje/src/lib/edje_cache.c =================================================================== --- trunk/edje/src/lib/edje_cache.c 2012-10-16 09:21:20 UTC (rev 78043) +++ trunk/edje/src/lib/edje_cache.c 2012-10-16 09:43:26 UTC (rev 78044) @@ -530,7 +530,7 @@ } } -void +EAPI void _edje_cache_file_unref(Edje_File *edf) { edf->references--; Modified: trunk/edje/src/lib/edje_data.c =================================================================== --- trunk/edje/src/lib/edje_data.c 2012-10-16 09:21:20 UTC (rev 78043) +++ trunk/edje/src/lib/edje_data.c 2012-10-16 09:43:26 UTC (rev 78044) @@ -58,7 +58,7 @@ Eet_Data_Descriptor *_edje_edd_edje_part_limit = NULL; #define EMP(Type, Minus) \ - Eina_Mempool *_emp_##Type = NULL; \ + EAPI Eina_Mempool *_emp_##Type = NULL; \ \ static void * \ mem_alloc_##Minus(size_t size) \ Modified: trunk/edje/src/lib/edje_private.h =================================================================== --- trunk/edje/src/lib/edje_private.h 2012-10-16 09:21:20 UTC (rev 78043) +++ trunk/edje/src/lib/edje_private.h 2012-10-16 09:43:26 UTC (rev 78044) @@ -1701,18 +1701,18 @@ extern Eina_Mempool *_edje_real_part_mp; extern Eina_Mempool *_edje_real_part_state_mp; -extern Eina_Mempool *_emp_RECTANGLE; -extern Eina_Mempool *_emp_TEXT; -extern Eina_Mempool *_emp_IMAGE; -extern Eina_Mempool *_emp_PROXY; -extern Eina_Mempool *_emp_SWALLOW; -extern Eina_Mempool *_emp_TEXTBLOCK; -extern Eina_Mempool *_emp_GROUP; -extern Eina_Mempool *_emp_BOX; -extern Eina_Mempool *_emp_TABLE; -extern Eina_Mempool *_emp_EXTERNAL; -extern Eina_Mempool *_emp_SPACER; -extern Eina_Mempool *_emp_part; +EAPI extern Eina_Mempool *_emp_RECTANGLE; +EAPI extern Eina_Mempool *_emp_TEXT; +EAPI extern Eina_Mempool *_emp_IMAGE; +EAPI extern Eina_Mempool *_emp_PROXY; +EAPI extern Eina_Mempool *_emp_SWALLOW; +EAPI extern Eina_Mempool *_emp_TEXTBLOCK; +EAPI extern Eina_Mempool *_emp_GROUP; +EAPI extern Eina_Mempool *_emp_BOX; +EAPI extern Eina_Mempool *_emp_TABLE; +EAPI extern Eina_Mempool *_emp_EXTERNAL; +EAPI extern Eina_Mempool *_emp_SPACER; +EAPI extern Eina_Mempool *_emp_part; void _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T v1, FLOAT_T v2); Edje_Part_Description_Common *_edje_part_description_find(Edje *ed, @@ -1732,8 +1732,8 @@ void _edje_callbacks_del(Evas_Object *obj, Edje *ed); void _edje_callbacks_focus_del(Evas_Object *obj, Edje *ed); -void _edje_edd_init(void); -void _edje_edd_shutdown(void); +EAPI void _edje_edd_init(void); +EAPI void _edje_edd_shutdown(void); int _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested); @@ -1916,7 +1916,7 @@ void _edje_cache_coll_clean(Edje_File *edf); void _edje_cache_coll_flush(Edje_File *edf); void _edje_cache_coll_unref(Edje_File *edf, Edje_Part_Collection *edc); -void _edje_cache_file_unref(Edje_File *edf); +EAPI void _edje_cache_file_unref(Edje_File *edf); void _edje_embryo_globals_init(Edje *ed); |
From: Enlightenment S. <no-...@en...> - 2012-12-08 09:21:17
|
Log: edje: use eo more. Author: cedric Date: 2012-12-08 01:21:10 -0800 (Sat, 08 Dec 2012) New Revision: 80519 Trac: http://trac.enlightenment.org/e/changeset/80519 Modified: trunk/edje/src/lib/edje_calc.c Modified: trunk/edje/src/lib/edje_calc.c =================================================================== --- trunk/edje/src/lib/edje_calc.c 2012-12-08 08:53:38 UTC (rev 80518) +++ trunk/edje/src/lib/edje_calc.c 2012-12-08 09:21:10 UTC (rev 80519) @@ -676,8 +676,9 @@ ed->recalc_hints = EINA_FALSE; - edje_object_size_min_calc(ed->obj, &w, &h); - evas_object_size_hint_min_set(ed->obj, w, h); + eo_do(ed->obj, + edje_obj_size_min_get(&w, &h), + evas_obj_size_hint_min_set(w, h)); } if (!ed->collection) return ; @@ -1230,9 +1231,9 @@ tw = th = 0; if (!chosen_desc->text.min_x) { - evas_object_resize(ep->object, params->w, params->h); - evas_object_textblock_size_formatted_get(ep->object, &tw, - &th); + eo_do(ep->object, + evas_obj_size_set(params->w, params->h), + evas_obj_textblock_size_formatted_get(&tw, &th)); } else evas_object_textblock_size_native_get(ep->object, &tw, &th); @@ -1257,8 +1258,9 @@ tw = th = 0; if (!chosen_desc->text.max_x) { - evas_object_resize(ep->object, params->w, params->h); - evas_object_textblock_size_formatted_get(ep->object, &tw, &th); + eo_do(ep->object, + evas_obj_size_set(params->w, params->h), + evas_obj_textblock_size_formatted_get(&tw, &th)); } else evas_object_textblock_size_native_get(ep->object, &tw, &th); @@ -1282,16 +1284,17 @@ double s = 1.0; if (ep->part->scale) s = TO_DOUBLE(sc); - evas_object_scale_set(ep->object, s); - evas_object_textblock_size_formatted_get(ep->object, &tw, &th); + eo_do(ep->object, + evas_obj_scale_set(s), + evas_obj_textblock_size_formatted_get(&tw, &th)); if (chosen_desc->text.fit_x) { if ((tw > 0) && (tw > params->w)) { s = (s * params->w) / (double)tw; - evas_object_scale_set(ep->object, s); - evas_object_textblock_size_formatted_get(ep->object, - &tw, &th); + eo_do(ep->object, + evas_obj_scale_set(s), + evas_obj_textblock_size_formatted_get(&tw, &th)); } } if (chosen_desc->text.fit_y) @@ -1299,9 +1302,9 @@ if ((th > 0) && (th > params->h)) { s = (s * params->h) / (double)th; - evas_object_scale_set(ep->object, s); - evas_object_textblock_size_formatted_get(ep->object, - &tw, &th); + eo_do(ep->object, + evas_obj_scale_set(s), + evas_obj_textblock_size_formatted_get(&tw, &th)); } } } @@ -1373,8 +1376,9 @@ (!chosen_desc->text.max_x) && (!chosen_desc->text.max_y))) return; - evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th); - evas_object_text_style_pad_get(ep->object, &l, &r, &t, &b); + eo_do(ep->object, + evas_obj_size_get(&tw, &th), + evas_obj_text_style_pad_get(&l, &r, &t, &b)); mw = tw + l + r; mh = th + t + b; @@ -1533,9 +1537,10 @@ [(ep->part->effect & EDJE_TEXT_EFFECT_MASK_SHADOW_DIRECTION) >> 4]; EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(style, shadow); - evas_object_text_style_set(ep->object, style); - evas_object_text_text_set(ep->object, text); - evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th); + eo_do(ep->object, + evas_obj_text_style_set(style), + evas_obj_text_text_set(text), + evas_obj_size_get(&tw, &th)); if (chosen_desc->text.max_x) { int l, r; @@ -2121,9 +2126,10 @@ { Evas_Coord lminw = 0, lminh = 0; - evas_object_smart_need_recalculate_set(ep->object, 1); - evas_object_smart_calculate(ep->object); - evas_object_size_hint_min_get(ep->object, &lminw, &lminh); + eo_do(ep->object, + evas_obj_smart_need_recalculate_set(1), + evas_obj_smart_calculate(), + evas_obj_size_hint_min_get(&lminw, &lminh)); if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) { if (lminw > minw) minw = lminw; @@ -2139,9 +2145,10 @@ { Evas_Coord lminw = 0, lminh = 0; - evas_object_smart_need_recalculate_set(ep->object, 1); - evas_object_smart_calculate(ep->object); - evas_object_size_hint_min_get(ep->object, &lminw, &lminh); + eo_do(ep->object, + evas_obj_smart_need_recalculate_set(1), + evas_obj_smart_calculate(), + evas_obj_size_hint_min_get(&lminw, &lminh)); if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) { if (lminw > minw) minw = lminw; @@ -2308,13 +2315,15 @@ Edje_Calc_Params *p3 __UNUSED__, Edje_Part_Description_Table *chosen_desc) { - evas_object_table_homogeneous_set(ep->object, chosen_desc->table.homogeneous); - evas_object_table_align_set(ep->object, TO_DOUBLE(chosen_desc->table.align.x), TO_DOUBLE(chosen_desc->table.align.y)); - evas_object_table_padding_set(ep->object, chosen_desc->table.padding.x, chosen_desc->table.padding.y); + eo_do(ep->object, + evas_obj_table_homogeneous_set(chosen_desc->table.homogeneous), + evas_obj_table_align_set(TO_DOUBLE(chosen_desc->table.align.x), TO_DOUBLE(chosen_desc->table.align.y)), + evas_obj_table_padding_set(chosen_desc->table.padding.x, chosen_desc->table.padding.y)); if (evas_object_smart_need_recalculate_get(ep->object)) { - evas_object_smart_need_recalculate_set(ep->object, 0); - evas_object_smart_calculate(ep->object); + eo_do(ep->object, + evas_obj_smart_need_recalculate_set(0), + evas_obj_smart_calculate()); } } @@ -2372,9 +2381,10 @@ } } - evas_object_image_fill_set(ep->object, p3->type.common.fill.x, p3->type.common.fill.y, - p3->type.common.fill.w, p3->type.common.fill.h); - evas_object_image_smooth_scale_set(ep->object, p3->smooth); + eo_do(ep->object, + evas_obj_image_fill_set(p3->type.common.fill.x, p3->type.common.fill.y, + p3->type.common.fill.w, p3->type.common.fill.h), + evas_obj_image_smooth_scale_set(p3->smooth)); } static void @@ -2384,9 +2394,10 @@ sc = ed->scale; if (sc == 0.0) sc = _edje_scale; - evas_object_image_fill_set(ep->object, p3->type.common.fill.x, p3->type.common.fill.y, - p3->type.common.fill.w, p3->type.common.fill.h); - evas_object_image_smooth_scale_set(ep->object, p3->smooth); + eo_do(ep->object, + evas_obj_image_fill_set(p3->type.common.fill.x, p3->type.common.fill.y, + p3->type.common.fill.w, p3->type.common.fill.h), + evas_obj_image_smooth_scale_set(p3->smooth)); if (chosen_desc->image.border.scale) { if (p3->type.common.spec.image.border_scale_by > FROM_DOUBLE(0.0)) @@ -3149,15 +3160,16 @@ } else #endif - evas_object_move(ep->object, ed->x + pf->x, ed->y + pf->y); - evas_object_resize(ep->object, pf->w, pf->h); + eo_do(ep->object, + evas_obj_position_set(ed->x + pf->x, ed->y + pf->y), + evas_obj_size_set(pf->w, pf->h)); if (ep->nested_smart) { /* Move, Resize all nested parts */ /* Not really needed but will improve the bounding box evaluation done by Evas */ - evas_object_move(ep->nested_smart, - ed->x + pf->x, ed->y + pf->y); - evas_object_resize(ep->nested_smart, pf->w, pf->h); + eo_do(ep->nested_smart, + evas_obj_position_set(ed->x + pf->x, ed->y + pf->y), + evas_obj_size_set(pf->w, pf->h)); } if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) _edje_entry_real_part_configure(ep); @@ -3225,9 +3237,10 @@ // pf->color.a); if (pf->visible) { - evas_object_move(ep->typedata.swallow->swallowed_object, ed->x + pf->x, ed->y + pf->y); - evas_object_resize(ep->typedata.swallow->swallowed_object, pf->w, pf->h); - evas_object_show(ep->typedata.swallow->swallowed_object); + eo_do(ep->typedata.swallow->swallowed_object, + evas_obj_position_set(ed->x + pf->x, ed->y + pf->y), + evas_obj_size_set(pf->w, pf->h), + evas_obj_visibility_set(EINA_TRUE)); } else evas_object_hide(ep->typedata.swallow->swallowed_object); mo = ep->typedata.swallow->swallowed_object; @@ -3300,21 +3313,24 @@ if (ep->nested_smart) { /* Apply map to smart obj holding nested parts */ - evas_object_map_set(ep->nested_smart, map); - evas_object_map_enable_set(ep->nested_smart, 1); + eo_do(ep->nested_smart, + evas_obj_map_set(map), + evas_obj_map_enable_set(1)); } else { - evas_object_map_set(mo, map); - evas_object_map_enable_set(mo, 1); + eo_do(mo, + evas_obj_map_set(map), + evas_obj_map_enable_set(1)); } } else { if (ep->nested_smart) { /* Cancel map of smart obj holding nested parts */ - evas_object_map_enable_set(ep->nested_smart, 0); - evas_object_map_set(ep->nested_smart, NULL); + eo_do(ep->nested_smart, + evas_obj_map_enable_set(0), + evas_obj_map_set(NULL)); } else { @@ -3322,8 +3338,9 @@ if (!ep->body) { #endif - evas_object_map_enable_set(mo, 0); - evas_object_map_set(mo, NULL); + eo_do(mo, + evas_obj_map_enable_set(0), + evas_obj_map_set(NULL)); #ifdef HAVE_EPHYSICS } #endif |
From: Enlightenment S. <no-...@en...> - 2012-12-11 10:51:02
|
Log: edje: use more eo_do. Author: cedric Date: 2012-12-11 02:50:51 -0800 (Tue, 11 Dec 2012) New Revision: 80643 Trac: http://trac.enlightenment.org/e/changeset/80643 Modified: trunk/edje/src/lib/edje_text.c Modified: trunk/edje/src/lib/edje_text.c =================================================================== --- trunk/edje/src/lib/edje_text.c 2012-12-11 10:49:53 UTC (rev 80642) +++ trunk/edje/src/lib/edje_text.c 2012-12-11 10:50:51 UTC (rev 80643) @@ -132,11 +132,12 @@ if (sw <= 1) return ""; if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); - evas_object_text_font_set(ep->object, font, size); - evas_object_text_text_set(ep->object, text); + eo_do(ep->object, + evas_obj_text_font_set(font, size), + evas_obj_text_text_set(text), + evas_obj_text_style_pad_get(&l, &r, NULL, NULL)); part_get_geometry(ep, &tw, &th); - evas_object_text_style_pad_get(ep->object, &l, &r, NULL, NULL); p = ((sw - tw) * params->type.text.elipsis); @@ -446,8 +447,9 @@ else evas_object_text_font_source_set(ep->object, NULL); if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); - evas_object_text_font_set(ep->object, font, size); - evas_object_text_text_set(ep->object, text); + eo_do(ep->object, + evas_obj_text_font_set(font, size), + evas_obj_text_text_set(text)); part_get_geometry(ep, &tw, &th); /* Find the wanted font size */ if ((tw != sw) && (size > 0) && (tw != 0)) @@ -478,8 +480,9 @@ else evas_object_text_font_source_set(ep->object, NULL); if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); - evas_object_text_font_set(ep->object, font, size); - evas_object_text_text_set(ep->object, text); + eo_do(ep->object, + evas_obj_text_font_set(font, size), + evas_obj_text_text_set(text)); part_get_geometry(ep, &tw, &th); /* only grow the font size if we didn't already reach the max size @@ -584,8 +587,9 @@ else evas_object_text_font_source_set(ep->object, NULL); if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); - evas_object_text_font_set(ep->object, font, size); - evas_object_text_text_set(ep->object, text); + eo_do(ep->object, + evas_obj_text_font_set(font, size), + evas_obj_text_text_set(text)); part_get_geometry(ep, &tw, &th); /* Handle alignment */ { @@ -668,29 +672,27 @@ break; case EDJE_TEXT_EFFECT_OUTLINE_SHADOW: style = EVAS_TEXT_STYLE_OUTLINE_SHADOW; - evas_object_text_outline_color_set(ep->object, - (params->type.text.color2.r * params->type.text.color2.a) / 255, - (params->type.text.color2.g * params->type.text.color2.a) / 255, - (params->type.text.color2.b * params->type.text.color2.a) / 255, - params->type.text.color2.a); - evas_object_text_shadow_color_set(ep->object, - (params->type.text.color3.r * params->type.text.color3.a) / 255, - (params->type.text.color3.g * params->type.text.color3.a) / 255, - (params->type.text.color3.b * params->type.text.color3.a) / 255, - params->type.text.color3.a); + eo_do(ep->object, + evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255, + (params->type.text.color2.g * params->type.text.color2.a) / 255, + (params->type.text.color2.b * params->type.text.color2.a) / 255, + params->type.text.color2.a), + evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255, + (params->type.text.color3.g * params->type.text.color3.a) / 255, + (params->type.text.color3.b * params->type.text.color3.a) / 255, + params->type.text.color3.a)); break; case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW; - evas_object_text_outline_color_set(ep->object, - (params->type.text.color2.r * params->type.text.color2.a) / 255, - (params->type.text.color2.g * params->type.text.color2.a) / 255, - (params->type.text.color2.b * params->type.text.color2.a) / 255, - params->type.text.color2.a); - evas_object_text_shadow_color_set(ep->object, - (params->type.text.color3.r * params->type.text.color3.a) / 255, - (params->type.text.color3.g * params->type.text.color3.a) / 255, - (params->type.text.color3.b * params->type.text.color3.a) / 255, - params->type.text.color3.a); + eo_do(ep->object, + evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255, + (params->type.text.color2.g * params->type.text.color2.a) / 255, + (params->type.text.color2.b * params->type.text.color2.a) / 255, + params->type.text.color2.a), + evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255, + (params->type.text.color3.g * params->type.text.color3.a) / 255, + (params->type.text.color3.b * params->type.text.color3.a) / 255, + params->type.text.color3.a)); break; case EDJE_TEXT_EFFECT_FAR_SHADOW: style = EVAS_TEXT_STYLE_FAR_SHADOW; @@ -710,16 +712,15 @@ break; case EDJE_TEXT_EFFECT_GLOW: style = EVAS_TEXT_STYLE_GLOW; - evas_object_text_glow_color_set(ep->object, - (params->type.text.color2.r * params->type.text.color2.a) / 255, - (params->type.text.color2.g * params->type.text.color2.a) / 255, - (params->type.text.color2.b * params->type.text.color2.a) / 255, - params->type.text.color2.a); - evas_object_text_glow2_color_set(ep->object, - (params->type.text.color3.r * params->type.text.color3.a) / 255, - (params->type.text.color3.g * params->type.text.color3.a) / 255, - (params->type.text.color3.b * params->type.text.color3.a) / 255, - params->type.text.color3.a); + eo_do(ep->object, + evas_obj_text_glow_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255, + (params->type.text.color2.g * params->type.text.color2.a) / 255, + (params->type.text.color2.b * params->type.text.color2.a) / 255, + params->type.text.color2.a), + evas_obj_text_glow2_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255, + (params->type.text.color3.g * params->type.text.color3.a) / 255, + (params->type.text.color3.b * params->type.text.color3.a) / 255, + params->type.text.color3.a)); break; default: style = EVAS_TEXT_STYLE_PLAIN; |
From: Enlightenment S. <no-...@en...> - 2012-12-13 05:31:01
|
Log: edje: don't expose private variable in our public API. Author: cedric Date: 2012-12-12 21:30:54 -0800 (Wed, 12 Dec 2012) New Revision: 80793 Trac: http://trac.enlightenment.org/e/changeset/80793 Modified: trunk/edje/src/lib/Edje.h trunk/edje/src/lib/edje_edit.c trunk/edje/src/lib/edje_load.c trunk/edje/src/lib/edje_smart.c Modified: trunk/edje/src/lib/Edje.h =================================================================== --- trunk/edje/src/lib/Edje.h 2012-12-13 05:25:13 UTC (rev 80792) +++ trunk/edje/src/lib/Edje.h 2012-12-13 05:30:54 UTC (rev 80793) @@ -2671,7 +2671,7 @@ * * @see edje_object_file_set */ -#define edje_obj_file_set(file, group, nested, ret) EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_FILE_SET), EO_TYPECHECK(const char*, file), EO_TYPECHECK(const char *, group), EO_TYPECHECK(Eina_Array *, nested), EO_TYPECHECK(Eina_Bool *, ret) +#define edje_obj_file_set(file, group, ret) EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_FILE_SET), EO_TYPECHECK(const char*, file), EO_TYPECHECK(const char *, group), EO_TYPECHECK(Eina_Bool *, ret) /** * @def edje_obj_file_get Modified: trunk/edje/src/lib/edje_edit.c =================================================================== --- trunk/edje/src/lib/edje_edit.c 2012-12-13 05:25:13 UTC (rev 80792) +++ trunk/edje/src/lib/edje_edit.c 2012-12-13 05:30:54 UTC (rev 80793) @@ -173,7 +173,6 @@ { const char *file = va_arg(*list, const char *); const char *group= va_arg(*list, const char *); - Eina_Array *nested = va_arg(*list, Eina_Array *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); Edje_Edit *eed = _pd; Eet_File *ef; @@ -199,7 +198,7 @@ * groups). */ Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, edje_obj_file_set(file, group, nested, &int_ret)); + eo_do_super(obj, edje_obj_file_set(file, group, &int_ret)); if (!int_ret) return; Modified: trunk/edje/src/lib/edje_load.c =================================================================== --- trunk/edje/src/lib/edje_load.c 2012-12-13 05:25:13 UTC (rev 80792) +++ trunk/edje/src/lib/edje_load.c 2012-12-13 05:30:54 UTC (rev 80793) @@ -75,13 +75,8 @@ { if (!obj) return EINA_FALSE; Eina_Bool ret = EINA_FALSE; - Eina_Array *nested; - nested = eina_array_new(8); - eo_do(obj, edje_obj_file_set(file, group, nested, &ret)); - eina_array_free(nested); - nested = NULL; - + eo_do(obj, edje_obj_file_set(file, group, &ret)); _edje_object_orientation_inform(obj); return ret; } Modified: trunk/edje/src/lib/edje_smart.c =================================================================== --- trunk/edje/src/lib/edje_smart.c 2012-12-13 05:25:13 UTC (rev 80792) +++ trunk/edje/src/lib/edje_smart.c 2012-12-13 05:30:54 UTC (rev 80793) @@ -302,11 +302,14 @@ { const char *file = va_arg(*list, const char *); const char *group = va_arg(*list, const char *); - Eina_Array *nested = va_arg(*list, Eina_Array *); Eina_Bool *ret = va_arg(*list, Eina_Bool *); + Eina_Array *nested; if (ret) *ret = EINA_FALSE; + + nested = eina_array_new(8); if (_edje_object_file_set_internal(obj, file, group, NULL, NULL, nested)) - if (ret) *ret = EINA_TRUE; + if (ret) *ret = EINA_TRUE; + eina_array_free(nested); } static void |