forked from enlightenment/efl
sanitize border scaling middle something logic. if the property needs to set to 'true' to be disabled, we better name it that way. this breaks eet compatibility, but since the previous commit is still young, i don't increment the version ids
SVN revision: 14048
This commit is contained in:
parent
75662fc7d3
commit
f06dec0f74
|
@ -1367,7 +1367,7 @@ st_collections_group_parts_part_description_image_middle(void)
|
||||||
|
|
||||||
ed = ep->default_desc;
|
ed = ep->default_desc;
|
||||||
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
|
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
|
||||||
ed->border.fill = !parse_bool(0);
|
ed->border.no_fill = !parse_bool(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -983,7 +983,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags)
|
||||||
evas_object_image_smooth_scale_set(ep->object, p3.smooth);
|
evas_object_image_smooth_scale_set(ep->object, p3.smooth);
|
||||||
|
|
||||||
evas_object_image_border_set(ep->object, p3.border.l, p3.border.r, p3.border.t, p3.border.b);
|
evas_object_image_border_set(ep->object, p3.border.l, p3.border.r, p3.border.t, p3.border.b);
|
||||||
evas_object_image_border_center_fill_set(ep->object, !(chosen_desc->border.fill));
|
evas_object_image_border_center_fill_set(ep->object, !(chosen_desc->border.no_fill));
|
||||||
image_id = ep->param1.description->image.id;
|
image_id = ep->param1.description->image.id;
|
||||||
image_count = 2;
|
image_count = 2;
|
||||||
if (ep->param2.description)
|
if (ep->param2.description)
|
||||||
|
|
|
@ -183,7 +183,7 @@ _edje_edd_setup(void)
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.r", border.r, EET_T_INT);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.r", border.r, EET_T_INT);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.t", border.t, EET_T_INT);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.t", border.t, EET_T_INT);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.b", border.b, EET_T_INT);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.b", border.b, EET_T_INT);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.fill", border.fill, EET_T_UCHAR);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "border.no_fill", border.no_fill, EET_T_UCHAR);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "fill.smooth", fill.smooth, EET_T_CHAR);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "fill.smooth", fill.smooth, EET_T_CHAR);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "fill.pos_rel_x", fill.pos_rel_x, EET_T_DOUBLE);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "fill.pos_rel_x", fill.pos_rel_x, EET_T_DOUBLE);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "fill.pos_abs_x", fill.pos_abs_x, EET_T_INT);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "fill.pos_abs_x", fill.pos_abs_x, EET_T_INT);
|
||||||
|
|
|
@ -347,7 +347,7 @@ struct _Edje_Part_Description
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
int l, r, t, b; /* border scaling on image fill */
|
int l, r, t, b; /* border scaling on image fill */
|
||||||
unsigned char fill; /* do we fill the center of the image if bordered? 1 == NO!!!! */
|
unsigned char no_fill; /* do we fill the center of the image if bordered? 1 == NO!!!! */
|
||||||
} border;
|
} border;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
|
Loading…
Reference in New Issue