forked from enlightenment/efl
edje: make setters for "edje_edit_state_color..." return Eina_Bool.
This patch start returning Eina_Bool for the following color setters to be able to detect errors when calling them. edje_edit_state_color_set edje_edit_state_color2_set edje_edit_state_color3_set Reviewers: cedric, seoz Reviewed By: cedric CC: reutskiy.v.v Differential Revision: https://phab.enlightenment.org/D297 Signed-off-by: Cedric Bail <cedric.bail@free.fr>
This commit is contained in:
parent
26cd65cfcb
commit
503cbbe80b
|
@ -1518,8 +1518,10 @@ EAPI void edje_edit_state_color3_get(Evas_Object *obj, const char *part, const c
|
||||||
* @param g The green value of the color.
|
* @param g The green value of the color.
|
||||||
* @param b The blue value of the color.
|
* @param b The blue value of the color.
|
||||||
* @param a The alpha value of the color.
|
* @param a The alpha value of the color.
|
||||||
|
*
|
||||||
|
* @return EINA_TRUE If successfull, EINA_FALSE otherwise.
|
||||||
*/
|
*/
|
||||||
EAPI void edje_edit_state_color_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
|
EAPI Eina_Bool edje_edit_state_color_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
|
||||||
|
|
||||||
/** Set the color2 of a part state.
|
/** Set the color2 of a part state.
|
||||||
*
|
*
|
||||||
|
@ -1531,8 +1533,10 @@ EAPI void edje_edit_state_color_set(Evas_Object *obj, const char *part, const ch
|
||||||
* @param g The green value of the color.
|
* @param g The green value of the color.
|
||||||
* @param b The blue value of the color.
|
* @param b The blue value of the color.
|
||||||
* @param a The alpha value of the color.
|
* @param a The alpha value of the color.
|
||||||
|
*
|
||||||
|
* @return EINA_TRUE If successfull, EINA_FALSE otherwise.
|
||||||
*/
|
*/
|
||||||
EAPI void edje_edit_state_color2_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
|
EAPI Eina_Bool edje_edit_state_color2_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
|
||||||
|
|
||||||
/** Set the color3 of a part state.
|
/** Set the color3 of a part state.
|
||||||
*
|
*
|
||||||
|
@ -1544,8 +1548,10 @@ EAPI void edje_edit_state_color2_set(Evas_Object *obj, const char *part, const c
|
||||||
* @param g The green value of the color.
|
* @param g The green value of the color.
|
||||||
* @param b The blue value of the color.
|
* @param b The blue value of the color.
|
||||||
* @param a The alpha value of the color.
|
* @param a The alpha value of the color.
|
||||||
|
*
|
||||||
|
* @return EINA_TRUE If successfull, EINA_FALSE otherwise.
|
||||||
*/
|
*/
|
||||||
EAPI void edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
|
EAPI Eina_Bool edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
|
||||||
|
|
||||||
/** Get the horizontal align value of a part state.
|
/** Get the horizontal align value of a part state.
|
||||||
*
|
*
|
||||||
|
|
|
@ -3269,17 +3269,24 @@ FUNC_STATE_REL(rel2, y);
|
||||||
if (b) *b = pd->Code.b; \
|
if (b) *b = pd->Code.b; \
|
||||||
if (a) *a = pd->Code.a; \
|
if (a) *a = pd->Code.a; \
|
||||||
} \
|
} \
|
||||||
EAPI void \
|
EAPI Eina_Bool \
|
||||||
edje_edit_state_##Code##_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a) \
|
edje_edit_state_##Code##_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a) \
|
||||||
{ \
|
{ \
|
||||||
GET_PD_OR_RETURN(); \
|
if ((!obj) || (!part) || (!state)) \
|
||||||
|
return EINA_FALSE; \
|
||||||
|
GET_PD_OR_RETURN(EINA_FALSE); \
|
||||||
\
|
\
|
||||||
if (r > -1 && r < 256) pd->Code.r = r; \
|
if (r > -1 && r < 256) pd->Code.r = r; \
|
||||||
|
else return EINA_FALSE; \
|
||||||
if (g > -1 && g < 256) pd->Code.g = g; \
|
if (g > -1 && g < 256) pd->Code.g = g; \
|
||||||
|
else return EINA_FALSE; \
|
||||||
if (b > -1 && b < 256) pd->Code.b = b; \
|
if (b > -1 && b < 256) pd->Code.b = b; \
|
||||||
|
else return EINA_FALSE; \
|
||||||
if (a > -1 && a < 256) pd->Code.a = a; \
|
if (a > -1 && a < 256) pd->Code.a = a; \
|
||||||
|
else return EINA_FALSE; \
|
||||||
\
|
\
|
||||||
edje_object_calc_force(obj); \
|
edje_object_calc_force(obj); \
|
||||||
|
return EINA_TRUE; \
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNC_COLOR(color);
|
FUNC_COLOR(color);
|
||||||
|
@ -3310,25 +3317,32 @@ edje_edit_state_color3_get(Evas_Object *obj, const char *part, const char *state
|
||||||
if (a) *a = txt->text.color3.a;
|
if (a) *a = txt->text.color3.a;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI Eina_Bool
|
||||||
edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a)
|
edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a)
|
||||||
{
|
{
|
||||||
Edje_Part_Description_Text *txt;
|
Edje_Part_Description_Text *txt;
|
||||||
|
|
||||||
GET_PD_OR_RETURN();
|
if ((!obj) || (!part) || (!state))
|
||||||
|
return EINA_FALSE;
|
||||||
|
GET_PD_OR_RETURN(EINA_FALSE);
|
||||||
|
|
||||||
if ((rp->part->type != EDJE_PART_TYPE_TEXT) &&
|
if ((rp->part->type != EDJE_PART_TYPE_TEXT) &&
|
||||||
(rp->part->type != EDJE_PART_TYPE_TEXTBLOCK))
|
(rp->part->type != EDJE_PART_TYPE_TEXTBLOCK))
|
||||||
return;
|
return EINA_FALSE;
|
||||||
|
|
||||||
txt = (Edje_Part_Description_Text*) pd;
|
txt = (Edje_Part_Description_Text*) pd;
|
||||||
|
|
||||||
if (r > -1 && r < 256) txt->text.color3.r = r;
|
if (r > -1 && r < 256) txt->text.color3.r = r;
|
||||||
|
else return EINA_FALSE;
|
||||||
if (g > -1 && g < 256) txt->text.color3.g = g;
|
if (g > -1 && g < 256) txt->text.color3.g = g;
|
||||||
|
else return EINA_FALSE;
|
||||||
if (b > -1 && b < 256) txt->text.color3.b = b;
|
if (b > -1 && b < 256) txt->text.color3.b = b;
|
||||||
|
else return EINA_FALSE;
|
||||||
if (a > -1 && a < 256) txt->text.color3.a = a;
|
if (a > -1 && a < 256) txt->text.color3.a = a;
|
||||||
|
else return EINA_FALSE;
|
||||||
|
|
||||||
edje_object_calc_force(obj);
|
edje_object_calc_force(obj);
|
||||||
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define FUNC_STATE_DOUBLE(Class, Value) \
|
#define FUNC_STATE_DOUBLE(Class, Value) \
|
||||||
|
|
Loading…
Reference in New Issue