From: "Sung W. Park" <sungwoo@gmail.com>

Subject: [E-devel] [E-Devel][Patch] Evas GL Color Format Enum change
(and ElmGLview changes accordingly)

I'm submitting a patch that changes the color format for Evas GL.

When I first wrote Evas_GL, I just had EVAS_GL_RGB_8 and EVAS_GL_RGBA_8 and etc
but it was misleading for some people.  It was more of a filler since I couldn't decide on
a name.  I'm finally changing it to make it more clear.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64491 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index a341cf9..28413c1 100644 (file)
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -711,7 +711,7 @@ _map_mouse_up(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __U
 void
 test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *map;
+   Evas_Object *win, *bg, *map, *vbox, *r;
    int idx = 0;
 
    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 __
    elm_win_resize_object_add(win, bg);
    evas_object_show(bg);
 
+   vbox = elm_box_add(win);
+   elm_win_resize_object_add(win, vbox);
+   evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(vbox);
+
+   r = evas_object_rectangle_add(evas_object_evas_get(win));
+   evas_object_color_set(r, 20, 40, 60, 255);
+   evas_object_size_hint_min_set(r, 200, 200);
+   evas_object_show(r);
+   evas_object_size_hint_fill_set(r, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(vbox, r);
+   
    map = elm_map_add(win);
    if (map)
      {
@@ -736,7 +748,9 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
         printf("]\n");
 
         evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_win_resize_object_add(win, map);
+        evas_object_size_hint_fill_set(map, EVAS_HINT_FILL, EVAS_HINT_FILL);
+        elm_box_pack_end(vbox, map);
+//        elm_win_resize_object_add(win, map);
         evas_object_data_set(map, "window", win);
 
         //

diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 96dbd6a..82773e3 100644 (file)
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -219,7 +219,7 @@ elm_glview_add(Evas_Object *parent)
    Evas_Object *obj;
    Evas *e;
    Widget_Data *wd;
-   Evas_GL_Config cfg = { EVAS_GL_RGB_8,
+   Evas_GL_Config cfg = { EVAS_GL_RGB_888,
                           EVAS_GL_DEPTH_NONE,
                           EVAS_GL_STENCIL_NONE };
 
@@ -295,14 +295,14 @@ elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_GL_Config cfg = { EVAS_GL_RGBA_8,
+   Evas_GL_Config cfg = { EVAS_GL_RGBA_8888,
                           EVAS_GL_DEPTH_NONE,
                           EVAS_GL_STENCIL_NONE };
    if (!wd) return EINA_FALSE;
 
    // Set the configs
    if (mode & ELM_GLVIEW_ALPHA)
-     cfg.color_format = EVAS_GL_RGBA_8;
+     cfg.color_format = EVAS_GL_RGBA_8888;
 
    if (mode & ELM_GLVIEW_DEPTH)
      cfg.depth_bits = EVAS_GL_DEPTH_BIT_24;