summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/bin/test_map.c18
-rw-r--r--legacy/elementary/src/lib/elm_glview.c6
2 files changed, 19 insertions, 5 deletions
diff --git a/legacy/elementary/src/bin/test_map.c b/legacy/elementary/src/bin/test_map.c
index a341cf9670..28413c1091 100644
--- a/legacy/elementary/src/bin/test_map.c
+++ b/legacy/elementary/src/bin/test_map.c
@@ -711,7 +711,7 @@ _map_mouse_up(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __U
711void 711void
712test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 712test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
713{ 713{
714 Evas_Object *win, *bg, *map; 714 Evas_Object *win, *bg, *map, *vbox, *r;
715 int idx = 0; 715 int idx = 0;
716 716
717 win = elm_win_add(NULL, "map", ELM_WIN_BASIC); 717 win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
@@ -723,6 +723,18 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
723 elm_win_resize_object_add(win, bg); 723 elm_win_resize_object_add(win, bg);
724 evas_object_show(bg); 724 evas_object_show(bg);
725 725
726 vbox = elm_box_add(win);
727 elm_win_resize_object_add(win, vbox);
728 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
729 evas_object_show(vbox);
730
731 r = evas_object_rectangle_add(evas_object_evas_get(win));
732 evas_object_color_set(r, 20, 40, 60, 255);
733 evas_object_size_hint_min_set(r, 200, 200);
734 evas_object_show(r);
735 evas_object_size_hint_fill_set(r, EVAS_HINT_FILL, EVAS_HINT_FILL);
736 elm_box_pack_end(vbox, r);
737
726 map = elm_map_add(win); 738 map = elm_map_add(win);
727 if (map) 739 if (map)
728 { 740 {
@@ -736,7 +748,9 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
736 printf("]\n"); 748 printf("]\n");
737 749
738 evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 750 evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
739 elm_win_resize_object_add(win, map); 751 evas_object_size_hint_fill_set(map, EVAS_HINT_FILL, EVAS_HINT_FILL);
752 elm_box_pack_end(vbox, map);
753// elm_win_resize_object_add(win, map);
740 evas_object_data_set(map, "window", win); 754 evas_object_data_set(map, "window", win);
741 755
742 // 756 //
diff --git a/legacy/elementary/src/lib/elm_glview.c b/legacy/elementary/src/lib/elm_glview.c
index 96dbd6a550..82773e3f88 100644
--- a/legacy/elementary/src/lib/elm_glview.c
+++ b/legacy/elementary/src/lib/elm_glview.c
@@ -219,7 +219,7 @@ elm_glview_add(Evas_Object *parent)
219 Evas_Object *obj; 219 Evas_Object *obj;
220 Evas *e; 220 Evas *e;
221 Widget_Data *wd; 221 Widget_Data *wd;
222 Evas_GL_Config cfg = { EVAS_GL_RGB_8, 222 Evas_GL_Config cfg = { EVAS_GL_RGB_888,
223 EVAS_GL_DEPTH_NONE, 223 EVAS_GL_DEPTH_NONE,
224 EVAS_GL_STENCIL_NONE }; 224 EVAS_GL_STENCIL_NONE };
225 225
@@ -295,14 +295,14 @@ elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode)
295{ 295{
296 ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; 296 ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
297 Widget_Data *wd = elm_widget_data_get(obj); 297 Widget_Data *wd = elm_widget_data_get(obj);
298 Evas_GL_Config cfg = { EVAS_GL_RGBA_8, 298 Evas_GL_Config cfg = { EVAS_GL_RGBA_8888,
299 EVAS_GL_DEPTH_NONE, 299 EVAS_GL_DEPTH_NONE,
300 EVAS_GL_STENCIL_NONE }; 300 EVAS_GL_STENCIL_NONE };
301 if (!wd) return EINA_FALSE; 301 if (!wd) return EINA_FALSE;
302 302
303 // Set the configs 303 // Set the configs
304 if (mode & ELM_GLVIEW_ALPHA) 304 if (mode & ELM_GLVIEW_ALPHA)
305 cfg.color_format = EVAS_GL_RGBA_8; 305 cfg.color_format = EVAS_GL_RGBA_8888;
306 306
307 if (mode & ELM_GLVIEW_DEPTH) 307 if (mode & ELM_GLVIEW_DEPTH)
308 cfg.depth_bits = EVAS_GL_DEPTH_BIT_24; 308 cfg.depth_bits = EVAS_GL_DEPTH_BIT_24;