commit 515d1523423260c87a7b7ae728ec801f80fc8725
author Raphael Moll <ralf@android.com> Mon Oct 22 16:30:53 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 22 16:30:53 2012 -0700
tree 57f3028778485007d6dff2788f0be9735fc22f7c
parent a2cd5c5fb264c7363edc9afb32122b899ca69d81
parent 6e86d77975dde8f6bb06544f0639a448d7b4f862

Merge "Fix background color: remap ARGB depending on surface."

android/skin/window.c

diff --git a/android/skin/window.c b/android/skin/window.c
index 65276ac..71ac34d 100644
--- a/android/skin/window.c
+++ b/android/skin/window.c
@@ -1553,6 +1553,19 @@
     skin_window_redraw( window, NULL );
 }
 
+static uint32_t
+sdl_surface_map_argb( SDL_Surface* s, uint32_t  c )
+{
+    if (s != NULL) {
+        return SDL_MapRGBA( s->format,
+            ((c) >> 16) & 255,
+            ((c) >> 8) & 255,
+            ((c) & 255),
+            ((c) >> 24) & 255 );
+    }
+    return 0x00000000;
+}
+
 void
 skin_window_redraw( SkinWindow*  window, SkinRect*  rect )
 {
@@ -1572,7 +1585,8 @@
                 rd.w = r.size.w;
                 rd.h = r.size.h;
 
-                SDL_FillRect( window->surface, &rd, layout->color );
+                SDL_FillRect( window->surface, &rd,
+                              sdl_surface_map_argb( window->surface, layout->color ));
             }
         }