elementary: Add more icon parameters in edje

Signed-off-by: 윤정현 <jh0506.yun@samsung.com>
Signed-off-by: Mike McCormack <mj.mccormack@samsung.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@63970 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/edje_externals/elm_icon.c b/src/edje_externals/elm_icon.c
index 0c7556a..3d2ca29 100644 (file)
--- a/src/edje_externals/elm_icon.c
+++ b/src/edje_externals/elm_icon.c
@@ -1,13 +1,31 @@
+#include <assert.h>
 #include "private.h"
 
 typedef struct _Elm_Params_Icon
 {
+   const char *file;
+   Eina_Bool scale_up_exists;
+   Eina_Bool scale_up : 1;
+   Eina_Bool scale_down_exists;
+   Eina_Bool scale_down : 1;
+   Eina_Bool smooth_exists;
+   Eina_Bool smooth : 1;
+   Eina_Bool fill_outside_exists;
+   Eina_Bool fill_outside : 1;
+   Eina_Bool no_scale_exists;
+   Eina_Bool no_scale : 1;
+   Eina_Bool prescale_size_exists;
+   int prescale_size;
    Elm_Params base;
    const char *icon;
 } Elm_Params_Icon;
 
+static Elm_Params_Icon *param_icon;
+
 static void
-external_icon_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
+                        const void *from_params, const void *to_params,
+                        float pos __UNUSED__)
 {
    const Elm_Params_Icon *p;
    Evas_Object *edje;
@@ -17,6 +35,50 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fro
    else if (from_params) p = from_params;
    else return;
 
+   if (p->file)
+     {
+        elm_icon_file_set(obj, p->file, NULL);
+       param_icon->file = p->file;
+     }
+   if (p->smooth_exists)
+     {
+        elm_icon_smooth_set(obj, p->smooth);
+       param_icon->smooth = p->smooth;
+     }
+   if (p->no_scale_exists)
+     {
+        elm_icon_no_scale_set(obj, p->no_scale);
+       param_icon->no_scale = p->no_scale;
+     }
+   if (p->scale_up_exists && p->scale_down_exists)
+     {
+        elm_icon_scale_set(obj, p->scale_up, p->scale_down);
+       param_icon->scale_up = p->scale_up;
+       param_icon->scale_down = p->scale_down;
+     }
+   else if (p->scale_up_exists || p->scale_down_exists)
+     {
+       if (p->scale_up_exists)
+         {
+            elm_icon_scale_set(obj, p->scale_up, param_icon->scale_down);
+            param_icon->scale_up = p->scale_up;
+         }
+       else
+         {
+            elm_icon_scale_set(obj, param_icon->scale_up, p->scale_down);
+            param_icon->scale_down = p->scale_down;
+         }
+     }
+   if (p->fill_outside_exists)
+     {
+        elm_icon_fill_outside_set(obj, p->fill_outside);
+       param_icon->fill_outside = p->fill_outside;
+     }
+   if (p->prescale_size_exists)
+     {
+        elm_icon_prescale_set(obj, p->prescale_size);
+       param_icon->prescale_size = p->prescale_size;
+     }
    if (p->icon)
      {
         edje = evas_object_smart_parent_get(obj);
@@ -28,12 +90,63 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fro
 }
 
 static Eina_Bool
-external_icon_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
+                        const Edje_External_Param *param)
 {
    Evas_Object *edje;
    const char *file;
 
-   if (!strcmp(param->name, "icon"))
+   if (!strcmp(param->name, "file")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+     {
+        Eina_Bool ret = elm_icon_file_set(obj, param->s, NULL);
+       if (ret)
+         param_icon->file = param->s;
+       return ret;
+     }
+   else if (!strcmp(param->name, "smooth")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+       elm_icon_smooth_set(obj, param->i);
+       param_icon->smooth = param->i;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "no scale")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+       elm_icon_no_scale_set(obj, param->i);
+       param_icon->no_scale = param->i;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale up")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+       elm_icon_scale_set(obj, param->i, param_icon->scale_down);
+       param_icon->scale_up = param->i;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale down")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+       elm_icon_scale_set(obj, param_icon->scale_up, param->i);
+       param_icon->scale_down = param->i;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "fill outside")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+       elm_icon_fill_outside_set(obj, param->i);
+       param_icon->fill_outside = param->i;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "prescale")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+     {
+       elm_icon_prescale_set(obj, param->i);
+       param_icon->prescale_size = param->i;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "icon"))
      {
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
           {
@@ -53,9 +166,53 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Exte
 }
 
 static Eina_Bool
-external_icon_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
+external_icon_param_get(void *data __UNUSED__,
+                        const Evas_Object *obj __UNUSED__,
+                        Edje_External_Param *param)
 {
-   if (!strcmp(param->name, "icon"))
+   if (!strcmp(param->name, "file")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+     {
+        param->s = param_icon->file;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "smooth")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->smooth;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "no scale")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->no_scale;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale up")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->scale_up;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale down")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+       param->i = param_icon->scale_down;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "fill outside")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->fill_outside;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "prescale")
+                  && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+     {
+        param->i = param_icon->prescale_size;
+       return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "icon"))
      {
         /* not easy to get icon name back from live object */
         return EINA_FALSE;
@@ -68,19 +225,52 @@ external_icon_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__
 }
 
 static void *
-external_icon_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+external_icon_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+                           const Eina_List *params)
 {
    Elm_Params_Icon *mem;
    Edje_External_Param *param;
    const Eina_List *l;
-
+   param_icon = calloc(1, sizeof(Elm_Params_Icon));
    mem = ELM_NEW(Elm_Params_Icon);
    if (!mem)
      return NULL;
 
    EINA_LIST_FOREACH(params, l, param)
      {
-        if (!strcmp(param->name, "icon"))
+        if (!strcmp(param->name, "file"))
+         mem->file = eina_stringshare_add(param->s);
+       else if (!strcmp(param->name, "smooth"))
+         {
+            mem->smooth = param->i;
+            mem->smooth_exists = EINA_TRUE;
+         }
+       else if (!strcmp(param->name, "no scale"))
+         {
+            mem->no_scale = param->i;
+            mem->no_scale_exists = EINA_TRUE;
+         }
+       else if (!strcmp(param->name, "scale up"))
+         {
+            mem->scale_up = param->i;
+            mem->scale_up_exists = EINA_TRUE;
+         }
+       else if (!strcmp(param->name, "scale down"))
+         {
+            mem->scale_down = param->i;
+            mem->scale_down_exists = EINA_TRUE;
+         }
+       else if (!strcmp(param->name, "fill outside"))
+         {
+            mem->fill_outside = param->i;
+            mem->fill_outside_exists = EINA_TRUE;
+         }
+       else if (!strcmp(param->name, "prescale"))
+         {
+            mem->prescale_size = param->i;
+            mem->prescale_size_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "icon"))
           {
              mem->icon = eina_stringshare_add(param->s);
           }
@@ -89,8 +279,10 @@ external_icon_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, c
    return mem;
 }
 
-static Evas_Object *external_icon_content_get(void *data __UNUSED__,
-                                              const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+static Evas_Object *
+external_icon_content_get(void *data __UNUSED__,
+                          const Evas_Object *obj __UNUSED__,
+                          const char *content __UNUSED__)
 {
    ERR("no content");
    return NULL;
@@ -101,14 +293,28 @@ external_icon_params_free(void *params)
 {
    Elm_Params_Icon *mem = params;
 
+   if (mem->file)
+     eina_stringshare_del(mem->file);
+
+   if (param_icon->file)
+     eina_stringshare_del(param_icon->file);
+   free(param_icon);
+
    if (mem->icon)
      eina_stringshare_del(mem->icon);
-   external_common_params_free(params);
+   free(mem);
 }
 
 static Edje_External_Param_Info external_icon_params[] = {
    DEFINE_EXTERNAL_COMMON_PARAMS,
    EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("file"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("smooth"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("no scale"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("scale up"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("scale down"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("fill outside"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("prescale"),
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };