diff options
author | Ji-Youn Park <jy0703.park@samsung.com> | 2016-03-11 14:27:34 +0830 |
---|---|---|
committer | Ji-Youn Park <jy0703.park@samsung.com> | 2016-03-17 16:50:00 +0830 |
commit | 715b4110e14c6ecbfbb8ca4c7bc14c84c12d3956 (patch) | |
tree | 039f227132bab9da14a05bf9b33f205bd0f24aab | |
parent | bd860627db6dcb93e92c04f774b7661b84f3acbd (diff) | |
download | elementary-715b4110e14c6ecbfbb8ca4c7bc14c84c12d3956.tar.gz |
Elm_glview: change method from changed_set to draw_request_set
changed_set method is already used in Evas.Object_Smart.
elm_glview_changed_set requests Elm_glview for drawing, so change the API to
elm_glview_draw_request_set.
-rw-r--r-- | src/lib/elm_glview.c | 16 | ||||
-rw-r--r-- | src/lib/elm_glview.eo | 4 | ||||
-rw-r--r-- | src/lib/elm_glview_legacy.h | 10 |
3 files changed, 24 insertions, 6 deletions
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c index bfa801d7f..e16eab5ce 100644 --- a/src/lib/elm_glview.c +++ b/src/lib/elm_glview.c @@ -79,7 +79,7 @@ _glview_update_surface(Evas_Object *obj) sd->config->options_bits = opt; evas_gl_native_surface_get(sd->evasgl, sd->surface, &ns); evas_object_image_native_surface_set(wd->resize_obj, &ns); - elm_glview_changed_set(obj); + elm_glview_draw_request_set(obj); // fake a resize event so that clients can reconfigure their viewport sd->resized = EINA_TRUE; @@ -308,6 +308,14 @@ elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version) return obj; } +EAPI void +elm_glview_changed_set(Evas_Object *obj) +{ + ELM_GLVIEW_CHECK(obj); + + elm_glview_draw_request_set(obj); +} + EOLIAN static void _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd, Evas_GL_Context_Version version) @@ -431,7 +439,7 @@ _elm_glview_resize_policy_set(Eo *obj, Elm_Glview_Data *sd, Elm_GLView_Resize_Po case ELM_GLVIEW_RESIZE_POLICY_SCALE: sd->scale_policy = policy; _glview_update_surface(obj); - elm_glview_changed_set(obj); + elm_glview_draw_request_set(obj); return EINA_TRUE; default: @@ -470,7 +478,7 @@ _elm_glview_size_set(Eo *obj, Elm_Glview_Data *sd, int w, int h) sd->h = h; _glview_update_surface(obj); - elm_glview_changed_set(obj); + elm_glview_draw_request_set(obj); } EOLIAN static void @@ -507,7 +515,7 @@ _elm_glview_render_func_set(Eo *obj EINA_UNUSED, Elm_Glview_Data *sd, Elm_GLView } EOLIAN static void -_elm_glview_changed_set(Eo *obj, Elm_Glview_Data *sd) +_elm_glview_draw_request_set(Eo *obj, Elm_Glview_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo index 16813d571..20c44abf2 100644 --- a/src/lib/elm_glview.eo +++ b/src/lib/elm_glview.eo @@ -122,7 +122,7 @@ class Elm.Glview (Elm.Widget) policy: Elm.GLView.Resize.Policy; [[The scaling policy.]] } } - @property changed { + @property draw_request { set { [[Notifies that there has been changes in the GLView.]] } @@ -208,7 +208,7 @@ class Elm.Glview (Elm.Widget) The render function gets called in the main loop but whether it runs depends on the rendering policy and whether - @.changed.set gets called. + @.draw_request.set gets called. ]] } values { diff --git a/src/lib/elm_glview_legacy.h b/src/lib/elm_glview_legacy.h index 41944daed..fe2d57b99 100644 --- a/src/lib/elm_glview_legacy.h +++ b/src/lib/elm_glview_legacy.h @@ -19,4 +19,14 @@ EAPI Evas_Object *elm_glview_add(Evas_Object *parent); */ EAPI Evas_Object *elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version); + +/** + * Notifies that there has been changes in the GLView. + * + * @param obj The GLView object + * + * @ingroup GLView + */ +EAPI void elm_glview_changed_set(Evas_Object *obj); + #include "elm_glview.eo.legacy.h" |