forked from enlightenment/efl
"Ooops, forgot about edje_external in the previous patch. Can someone apply this for me? Thanks."
By Rafael Fonseca <rfonseca@profusion.mobi> SVN revision: 50393
This commit is contained in:
parent
7808d77502
commit
e7bd53447a
|
@ -5,8 +5,6 @@
|
||||||
typedef struct _Elm_Params_Thumb
|
typedef struct _Elm_Params_Thumb
|
||||||
{
|
{
|
||||||
const char *animate;
|
const char *animate;
|
||||||
Eina_Bool keep_aspect:1;
|
|
||||||
Eina_Bool aspect_exists:1;
|
|
||||||
} Elm_Params_Thumb;
|
} Elm_Params_Thumb;
|
||||||
|
|
||||||
static const char* choices[] = {"loop", "start", "stop", NULL};
|
static const char* choices[] = {"loop", "start", "stop", NULL};
|
||||||
|
@ -41,8 +39,6 @@ external_thumb_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
|
||||||
if (set != ELM_THUMB_ANIMATION_LAST)
|
if (set != ELM_THUMB_ANIMATION_LAST)
|
||||||
elm_thumb_animate_set(obj, set);
|
elm_thumb_animate_set(obj, set);
|
||||||
}
|
}
|
||||||
if (p->aspect_exists)
|
|
||||||
elm_thumb_keep_aspect_set(obj, p->keep_aspect);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -58,14 +54,6 @@ external_thumb_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!strcmp(param->name, "aspect"))
|
|
||||||
{
|
|
||||||
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
|
|
||||||
{
|
|
||||||
elm_thumb_keep_aspect_set(obj, param->i);
|
|
||||||
return EINA_TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ERR("unknown parameter '%s' of type '%s'",
|
ERR("unknown parameter '%s' of type '%s'",
|
||||||
param->name, edje_external_param_type_str(param->type));
|
param->name, edje_external_param_type_str(param->type));
|
||||||
|
@ -89,14 +77,6 @@ external_thumb_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!strcmp(param->name, "aspect"))
|
|
||||||
{
|
|
||||||
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
|
|
||||||
{
|
|
||||||
param->i = elm_thumb_keep_aspect_get(obj);
|
|
||||||
return EINA_TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ERR("unknown parameter '%s' of type '%s'",
|
ERR("unknown parameter '%s' of type '%s'",
|
||||||
param->name, edje_external_param_type_str(param->type));
|
param->name, edje_external_param_type_str(param->type));
|
||||||
|
@ -119,11 +99,6 @@ external_thumb_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
|
||||||
{
|
{
|
||||||
if (!strcmp(param->name, "animate"))
|
if (!strcmp(param->name, "animate"))
|
||||||
mem->animate = eina_stringshare_add(param->s);
|
mem->animate = eina_stringshare_add(param->s);
|
||||||
else if (!strcmp(param->name, "aspect"))
|
|
||||||
{
|
|
||||||
mem->keep_aspect = !!param->i;
|
|
||||||
mem->aspect_exists = EINA_TRUE;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return mem;
|
return mem;
|
||||||
|
@ -142,7 +117,6 @@ external_thumb_params_free(void *params)
|
||||||
static Edje_External_Param_Info external_thumb_params[] =
|
static Edje_External_Param_Info external_thumb_params[] =
|
||||||
{
|
{
|
||||||
EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("animate", "loop", choices),
|
EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("animate", "loop", choices),
|
||||||
EDJE_EXTERNAL_PARAM_INFO_BOOL("keep aspect"),
|
|
||||||
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
|
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue