seoz pushed a commit to branch master.
commit 158ef383b74df740503da0f148c89b42fac1426d
Author: Daniel Juyung Seo <[email protected]>
Date: Thu Aug 29 12:35:13 2013 +0900
elm_bg: handle alpha value in elm_obj_bg_color_set/get APIs for Eo.
No ChangeLog and NEWS for eo.
---
src/lib/elm_bg.c | 10 ++++++----
src/lib/elm_bg_eo.h | 6 ++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index 9036fd6..ae63607 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -296,7 +296,7 @@ elm_bg_color_set(Evas_Object *obj,
int b)
{
ELM_BG_CHECK(obj);
- eo_do(obj, elm_obj_bg_color_set(r, g, b));
+ eo_do(obj, elm_obj_bg_color_set(r, g, b, 255));
}
static void
@@ -305,6 +305,7 @@ _color_set(Eo *obj, void *_pd, va_list *list)
int r = va_arg(*list, int);
int g = va_arg(*list, int);
int b = va_arg(*list, int);
+ int a = va_arg(*list, int);
Elm_Bg_Smart_Data *sd = _pd;
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
@@ -325,7 +326,7 @@ _color_set(Eo *obj, void *_pd, va_list *list)
elm_layout_sizing_eval(obj);
}
- evas_object_color_set(sd->rect, r, g, b, 255);
+ evas_object_color_set(sd->rect, r, g, b, a);
}
EAPI void
@@ -335,7 +336,7 @@ elm_bg_color_get(const Evas_Object *obj,
int *b)
{
ELM_BG_CHECK(obj);
- eo_do((Eo *) obj, elm_obj_bg_color_get(r, g, b));
+ eo_do((Eo *) obj, elm_obj_bg_color_get(r, g, b, NULL));
}
static void
@@ -344,9 +345,10 @@ _color_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
int *r = va_arg(*list, int *);
int *g = va_arg(*list, int *);
int *b = va_arg(*list, int *);
+ int *a = va_arg(*list, int *);
Elm_Bg_Smart_Data *sd = _pd;
- evas_object_color_get(sd->rect, r, g, b, NULL);
+ evas_object_color_get(sd->rect, r, g, b, a);
}
EAPI void
diff --git a/src/lib/elm_bg_eo.h b/src/lib/elm_bg_eo.h
index b989a58..ca0ebd4 100644
--- a/src/lib/elm_bg_eo.h
+++ b/src/lib/elm_bg_eo.h
@@ -88,12 +88,13 @@ enum
* @param[in] r
* @param[in] g
* @param[in] b
+ * @param[in] a
*
* @see elm_bg_color_set
*
* @ingroup Bg
*/
-#define elm_obj_bg_color_set(r, g, b)
ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_COLOR_SET), EO_TYPECHECK(int, r),
EO_TYPECHECK(int, g), EO_TYPECHECK(int, b)
+#define elm_obj_bg_color_set(r, g, b, a)
ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_COLOR_SET), EO_TYPECHECK(int, r),
EO_TYPECHECK(int, g), EO_TYPECHECK(int, b), EO_TYPECHECK(int, a)
/**
* @def elm_obj_bg_color_get
@@ -104,12 +105,13 @@ enum
* @param[out] r
* @param[out] g
* @param[out] b
+ * @param[out] a
*
* @see elm_bg_color_get
*
* @ingroup Bg
*/
-#define elm_obj_bg_color_get(r, g, b)
ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_COLOR_GET), EO_TYPECHECK(int *, r),
EO_TYPECHECK(int *, g), EO_TYPECHECK(int *, b)
+#define elm_obj_bg_color_get(r, g, b, a)
ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_COLOR_GET), EO_TYPECHECK(int *, r),
EO_TYPECHECK(int *, g), EO_TYPECHECK(int *, b), EO_TYPECHECK(int *, a)
/**
* @def elm_obj_bg_load_size_set
--
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk