| NOT & YOU BASTARD

[chaz/openbox] / otk / surface.cc

diff --git a/otk/surface.cc b/otk/surface.cc
index b7aadd0ff5f004a94d6d519e3a96f5bfc2c74a72..cc2255030d660f3aca605fedd0f17c9d1eb0cd5c 100644 (file)
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -46,8 +46,8 @@ void Surface::setPixmap(const RenderColor &color)
   XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
                  _size.width(), _size.height());
 
-  pixel32 val = (color.red() << default_red_shift) &
-    (color.green() << default_green_shift) &
+  pixel32 val = (color.red() << default_red_shift) |
+    (color.green() << default_green_shift) |
     (color.blue() << default_blue_shift);
   for (unsigned int i = 0, s = _size.width() * _size.height(); i < s; ++i)
     _pixel_data[i] = val;