NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ji-Youn Park 2016-03-11 14:27:34 +08:30
parent 03b147dc17
commit 36af2dfcd4
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/lib/elm_glview.c
View File

@ -79,7 +79,7 @@ _glview_update_surface(Evas_Object *obj)
sd->config->options_bits = opt; sd->config->options_bits = opt;
evas_gl_native_surface_get(sd->evasgl, sd->surface, &ns); evas_gl_native_surface_get(sd->evasgl, sd->surface, &ns);
evas_object_image_native_surface_set(wd->resize_obj, &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 // fake a resize event so that clients can reconfigure their viewport
sd->resized = EINA_TRUE; sd->resized = EINA_TRUE;
@ -308,6 +308,14 @@ elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)
return obj; return obj;
} }
EAPI void
elm_glview_changed_set(Evas_Object *obj)
{
ELM_GLVIEW_CHECK(obj);
elm_glview_draw_request_set(obj);
}
EOLIAN static void EOLIAN static void
_elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd, _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
Evas_GL_Context_Version version) 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: case ELM_GLVIEW_RESIZE_POLICY_SCALE:
sd->scale_policy = policy; sd->scale_policy = policy;
_glview_update_surface(obj); _glview_update_surface(obj);
elm_glview_changed_set(obj); elm_glview_draw_request_set(obj);
return EINA_TRUE; return EINA_TRUE;
default: default:
@ -470,7 +478,7 @@ _elm_glview_size_set(Eo *obj, Elm_Glview_Data *sd, int w, int h)
sd->h = h; sd->h = h;
_glview_update_surface(obj); _glview_update_surface(obj);
elm_glview_changed_set(obj); elm_glview_draw_request_set(obj);
} }
EOLIAN static void 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 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); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);

4
legacy/elementary/src/lib/elm_glview.eo
View File

@ -122,7 +122,7 @@ class Elm.Glview (Elm.Widget)
policy: Elm.GLView.Resize.Policy; [[The scaling policy.]] policy: Elm.GLView.Resize.Policy; [[The scaling policy.]]
} }
} }
@property changed { @property draw_request {
set { set {
[[Notifies that there has been changes in the GLView.]] [[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 The render function gets called in the main loop but whether
it runs depends on the rendering policy and whether it runs depends on the rendering policy and whether
@.changed.set gets called. @.draw_request.set gets called.
]] ]]
} }
values { values {

10
legacy/elementary/src/lib/elm_glview_legacy.h
View File

@ -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); 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" #include "elm_glview.eo.legacy.h"