raster pushed a commit to branch master.
commit 398bcc2008f1b82a99a2070f2f0dd26ba9dbbd91
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Mon May 20 13:00:11 2013 +0900
have glview test inset view a bit and allow testing of direct vs
indirect... so glview is never at 0,0...
---
src/bin/test_glview.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 65 insertions(+), 5 deletions(-)
diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index a97cc47..55f8a66 100644
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -489,6 +489,29 @@ _on_done(void *data,
}
static void
+_on_direct(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ elm_glview_mode_set(data, 0
+ | ELM_GLVIEW_ALPHA
+ | ELM_GLVIEW_DEPTH
+ | ELM_GLVIEW_DIRECT
+ );
+}
+
+static void
+_on_indirect(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ elm_glview_mode_set(data, 0
+ | ELM_GLVIEW_ALPHA
+ | ELM_GLVIEW_DEPTH
+ );
+}
+
+static void
_del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void
*event_info __UNUSED__)
{
Ecore_Animator *ani = evas_object_data_get(obj, "ani");
@@ -568,7 +591,7 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__,
Evas_Object *obj, void *eve
void
test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void
*event_info __UNUSED__)
{
- Evas_Object *win, *bx, *bt, *gl;
+ Evas_Object *win, *bx0, *bx, *bt, *gl;
Ecore_Animator *ani;
GLData *gld = NULL;
@@ -581,16 +604,44 @@ test_glview(void *data __UNUSED__, Evas_Object *obj
__UNUSED__, void *event_info
elm_win_autodel_set(win, EINA_TRUE);
+ bx0 = elm_box_add(win);
+ elm_box_horizontal_set(bx0, EINA_TRUE);
+ evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(win, bx0);
+ evas_object_show(bx0);
+
+ /* add an ok button */
+ bt = elm_button_add(win);
+ elm_object_text_set(bt, "OK");
+ evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(bt, 0.0, EVAS_HINT_EXPAND);
+ elm_box_pack_end(bx0, bt);
+ evas_object_show(bt);
+ evas_object_smart_callback_add(bt, "clicked", _on_done, win);
+
bx = elm_box_add(win);
+ evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bx);
+ elm_box_pack_end(bx0, bx);
evas_object_show(bx);
+ /* add an ok button */
+ bt = elm_button_add(win);
+ elm_object_text_set(bt, "OK");
+ evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+ elm_box_pack_end(bx, bt);
+ evas_object_show(bt);
+ evas_object_smart_callback_add(bt, "clicked", _on_done, win);
+
// Add a GLView
gl = elm_glview_add(win);
evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_glview_mode_set(gl, ELM_GLVIEW_ALPHA|ELM_GLVIEW_DEPTH);
+ elm_glview_mode_set(gl, 0
+ | ELM_GLVIEW_ALPHA
+ | ELM_GLVIEW_DEPTH
+ );
elm_glview_resize_policy_set(gl, ELM_GLVIEW_RESIZE_POLICY_RECREATE);
elm_glview_render_policy_set(gl, ELM_GLVIEW_RENDER_POLICY_ALWAYS);
elm_glview_init_func_set(gl, _init_gl);
@@ -616,13 +667,22 @@ test_glview(void *data __UNUSED__, Evas_Object *obj
__UNUSED__, void *event_info
/* add an ok button */
bt = elm_button_add(win);
- elm_object_text_set(bt, "OK");
+ elm_object_text_set(bt, "Direct");
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
elm_box_pack_end(bx, bt);
evas_object_show(bt);
- evas_object_smart_callback_add(bt, "clicked", _on_done, win);
+ evas_object_smart_callback_add(bt, "clicked", _on_direct, gl);
+ /* add an ok button */
+ bt = elm_button_add(win);
+ elm_object_text_set(bt, "I");
+ evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(bt, 0.0, EVAS_HINT_EXPAND);
+ elm_box_pack_end(bx0, bt);
+ evas_object_show(bt);
+ evas_object_smart_callback_add(bt, "clicked", _on_indirect, gl);
+
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
--
------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
