From a040e13f7e30c00a2c8e32f0506cd17e3d689fb6 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 17 Dec 2020 12:50:47 +0900 Subject: [PATCH] edje_data: Add missing descriptor for image.max(min).limit Summary: Edje_Part_Description_Image uses EDJE_DATA_DESCRIPTOR_DESCRIPTION_COMMON_SUB, EDJE_DATA_DESCRIPTOR_DESCRIPTION_COMMON_SUB is missing max.limit and min.limit descriptors. Therefore, max:SOURCE and min:SOURCE did not work in EDC. Adds a descriptor to it. https://www.enlightenment.org/_legacy_embed/edcref.html#sec_toplevel_images max [width] [height] or SOURCE The maximum size of the state. A size of -1 means that it will be ignored in one direction. When max is set to SOURCE, edje will enforce the part to be not more than the original image size. The part must be an IMAGE part. Test Plan: {F4230539} edje_cc test.edc && gcc -o test test.c `pkg-config --libs --cflags evas ecore ecore-evas edje` ./test Reviewers: Hermet, Jaehyun_Cho, cedric, raster Reviewed By: Hermet Subscribers: #reviewers, #committers, kimcinoo, herb Tags: #efl Differential Revision: https://phab.enlightenment.org/D12215 Change-Id: Ic67098d72ded7cb229c3dbd5c1b728d1884c36e4 --- src/lib/edje/edje_data.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c index fa36c82..d36db8f 100644 --- a/src/lib/edje/edje_data.c +++ b/src/lib/edje/edje_data.c @@ -829,8 +829,10 @@ _edje_edd_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "user_set.fixed", Dec.user_set.fixed, EET_T_UCHAR); \ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.w", Dec.min.w, EET_T_INT); \ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.h", Dec.min.h, EET_T_INT); \ + EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.limit", Dec.min.limit, EET_T_CHAR); \ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.w", Dec.max.w, EET_T_INT); \ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.h", Dec.max.h, EET_T_INT); \ + EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.limit", Dec.max.limit, EET_T_CHAR); \ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.x", Dec.step.x, EET_T_INT); \ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.y", Dec.step.y, EET_T_INT); \ EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "aspect.min", Dec.aspect.min, EDJE_T_FLOAT); \ -- 2.7.4