summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2014-12-24 16:29:49 +0900
committerChunEon Park <hermet@hermet.pe.kr>2014-12-24 16:29:49 +0900
commit382c41e42d6338b3a8db8914c8a056e2243a611f (patch)
tree5d93a9ee0ebbec2ba8f58ea216365214728569b7 /src/lib/edje
parent956754ee5752aa8f1f0bfc0676ebedc8b8b46f08 (diff)
edje: support anti_alias option
set anti_alias in part section. default is enabled. part { name: "test"; type: XXX; anti_alias: 0; ... } @feature
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_calc.c1
-rw-r--r--src/lib/edje/edje_data.c1
-rw-r--r--src/lib/edje/edje_edit.c1
-rw-r--r--src/lib/edje/edje_load.c5
-rw-r--r--src/lib/edje/edje_private.h1
-rw-r--r--src/lib/edje/edje_util.c6
6 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index faa1f95353..eab8ab1b88 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -580,7 +580,6 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
580 epd2 = _edje_part_description_find(ed, ep, d2, v2, EINA_TRUE); 580 epd2 = _edje_part_description_find(ed, ep, d2, v2, EINA_TRUE);
581 581
582 epdi = (Edje_Part_Description_Image*) epd2; 582 epdi = (Edje_Part_Description_Image*) epd2;
583
584 /* There is an animation if both description are different or if description is an image with tweens */ 583 /* There is an animation if both description are different or if description is an image with tweens */
585 if (epd2 && (epd1 != epd2 || (ep->part->type == EDJE_PART_TYPE_IMAGE && epdi->image.tweens_count))) 584 if (epd2 && (epd1 != epd2 || (ep->part->type == EDJE_PART_TYPE_IMAGE && epdi->image.tweens_count)))
586 { 585 {
diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c
index 0220ecf265..afd1e6df3b 100644
--- a/src/lib/edje/edje_data.c
+++ b/src/lib/edje/edje_data.c
@@ -1021,6 +1021,7 @@ _edje_edd_init(void)
1021#endif 1021#endif
1022 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "effect", effect, EET_T_UCHAR); 1022 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "effect", effect, EET_T_UCHAR);
1023 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "mouse_events", mouse_events, EET_T_UCHAR); 1023 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "mouse_events", mouse_events, EET_T_UCHAR);
1024 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "anti_alias", anti_alias, EET_T_UCHAR);
1024 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "repeat_events", repeat_events, EET_T_UCHAR); 1025 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "repeat_events", repeat_events, EET_T_UCHAR);
1025 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "ignore_flags", ignore_flags, EET_T_INT); 1026 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "ignore_flags", ignore_flags, EET_T_INT);
1026 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "scale", scale, EET_T_UCHAR); 1027 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "scale", scale, EET_T_UCHAR);
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 6208a4791d..c3f8405def 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -3032,6 +3032,7 @@ _edje_edit_real_part_add(Evas_Object *obj, const char *name, Edje_Part_Type type
3032 ep->name = eina_stringshare_add(name); 3032 ep->name = eina_stringshare_add(name);
3033 ep->mouse_events = 1; 3033 ep->mouse_events = 1;
3034 ep->repeat_events = 0; 3034 ep->repeat_events = 0;
3035 ep->anti_alias = 1;
3035 ep->ignore_flags = EVAS_EVENT_FLAG_NONE; 3036 ep->ignore_flags = EVAS_EVENT_FLAG_NONE;
3036 ep->pointer_mode = EVAS_OBJECT_POINTER_MODE_AUTOGRAB; 3037 ep->pointer_mode = EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
3037 ep->precise_is_inside = 0; 3038 ep->precise_is_inside = 0;
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 9914ced7d0..f55c5803bc 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -655,8 +655,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
655 evas_object_pass_events_set(rp->object, 1); 655 evas_object_pass_events_set(rp->object, 1);
656 evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB); 656 evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
657 } 657 }
658 if (ep->precise_is_inside) 658 eo_do(rp->object,
659 evas_object_precise_is_inside_set(rp->object, 1); 659 evas_obj_anti_alias_set(ep->anti_alias),
660 evas_obj_precise_is_inside_set(ep->precise_is_inside));
660 } 661 }
661 if (rp->part->clip_to_id < 0) 662 if (rp->part->clip_to_id < 0)
662 evas_object_clip_set(rp->object, ed->base->clipper); 663 evas_object_clip_set(rp->object, ed->base->clipper);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index c8492100a8..ab50abe8f0 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1085,6 +1085,7 @@ struct _Edje_Part
1085 unsigned char effect; /* 0 = plain... */ 1085 unsigned char effect; /* 0 = plain... */
1086 unsigned char mouse_events; /* it will affect/respond to mouse events */ 1086 unsigned char mouse_events; /* it will affect/respond to mouse events */
1087 unsigned char repeat_events; /* it will repeat events to objects below */ 1087 unsigned char repeat_events; /* it will repeat events to objects below */
1088 unsigned char anti_alias;
1088 Evas_Event_Flags ignore_flags; 1089 Evas_Event_Flags ignore_flags;
1089 unsigned char scale; /* should certain properties scale with edje scale factor? */ 1090 unsigned char scale; /* should certain properties scale with edje scale factor? */
1090 Edje_3D_Vec scale_3d; 1091 Edje_3D_Vec scale_3d;
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 9baa0d7d58..c2bac199ce 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -5136,9 +5136,9 @@ _edje_real_part_swallow(Edje *ed,
5136 else 5136 else
5137 evas_object_pass_events_set(obj_swallow, 1); 5137 evas_object_pass_events_set(obj_swallow, 1);
5138 _edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp); 5138 _edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp);
5139 5139 eo_do(obj_swallow,
5140 if (rp->part->precise_is_inside) 5140 evas_obj_anti_alias_set(rp->part->anti_alias),
5141 evas_object_precise_is_inside_set(obj_swallow, 1); 5141 evas_obj_precise_is_inside_set(rp->part->precise_is_inside));
5142 5142
5143 ed->dirty = EINA_TRUE; 5143 ed->dirty = EINA_TRUE;
5144 ed->recalc_call = EINA_TRUE; 5144 ed->recalc_call = EINA_TRUE;