From 11caa03abd9d2a16344ffbafe7958b0e7a5211fd Mon Sep 17 00:00:00 2001 From: Kyuho Jo Date: Fri, 27 Feb 2015 13:33:39 +0900 Subject: [PATCH] widget_get_evas_object -> widget_get_evas Change-Id: I2ede147ff659db0e9ad2fdc80cb128451854aac9 Signed-off-by: Kyuho Jo --- include/widget.h | 4 ++-- src/virtual_window.c | 13 ++----------- src/virtual_window_wayland.c | 13 ++----------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/include/widget.h b/include/widget.h index 787dde1..ed1752a 100755 --- a/include/widget.h +++ b/include/widget.h @@ -42,7 +42,7 @@ extern "C" { typedef struct widget_event_info *widget_event_info_t; /** - * @brief Creates an Object to create an elm_win object. + * @brief Creates an evas to draw widget contents * @details Creating a new Object using widget frame buffer. * @since_tizen 2.4 * @param[in] id Instance Id @@ -54,7 +54,7 @@ typedef struct widget_event_info *widget_event_info_t; * @retval Address Valid evas object * @retval @c NULL failed to create, widget_last_status() will returns reason of failure */ -extern void *widget_get_evas_object(const char *id, int gbar); +extern void *widget_get_evas(const char *id, int gbar); /** * @brief Set extra information for updated content. diff --git a/src/virtual_window.c b/src/virtual_window.c index 7c2a77e..7b8934d 100755 --- a/src/virtual_window.c +++ b/src/virtual_window.c @@ -879,7 +879,7 @@ static void ecore_evas_free_cb(Ecore_Evas *ee) info->ee = NULL; } -PUBLIC void *widget_get_evas_object(const char *id, int is_gbar) +PUBLIC void *widget_get_evas(const char *id, int is_gbar) { vwin_info_t info; Evas_Object *rect; @@ -999,16 +999,7 @@ PUBLIC void *widget_get_evas_object(const char *id, int is_gbar) evas_event_callback_add(info->e, EVAS_CALLBACK_RENDER_POST, post_render_cb, info); evas_event_callback_add(info->e, EVAS_CALLBACK_RENDER_PRE, pre_render_cb, info); - rect = evas_object_rectangle_add(info->e); - if (!rect) { - ErrPrint("Failed to create evas_object\n"); - ecore_evas_free(info->ee); - return NULL; - } - - evas_object_resize(rect, info->w, info->h); - evas_object_color_set(rect, 0, 0, 0, 0); - return rect; + return info->e; } /* End of a file */ diff --git a/src/virtual_window_wayland.c b/src/virtual_window_wayland.c index c49f043..61a9ebe 100755 --- a/src/virtual_window_wayland.c +++ b/src/virtual_window_wayland.c @@ -382,7 +382,7 @@ static void post_render_cb(void *data, Evas *e, void *event_info) } } -PUBLIC void *widget_get_evas_object(const char *id, int is_gbar) +PUBLIC void *widget_get_evas(const char *id, int is_gbar) { struct info *info; Evas_Object *rect; @@ -434,16 +434,7 @@ PUBLIC void *widget_get_evas_object(const char *id, int is_gbar) evas_event_callback_add(info->e, EVAS_CALLBACK_RENDER_POST, post_render_cb, info); evas_event_callback_add(info->e, EVAS_CALLBACK_RENDER_PRE, pre_render_cb, info); - rect = evas_object_rectangle_add(info->e); - if (!rect) { - ErrPrint("Failed to create evas_object\n"); - ecore_evas_free(info->ee); - return NULL; - } - - evas_object_resize(rect, 1, 1); - evas_object_color_set(rect, 0, 0, 0, 0); - return rect; + return info->e; } /* End of a file */ -- 2.7.4