From: Dana Jansens <danakj@orodu.net>
Date: Thu, 13 Feb 2003 10:30:17 +0000 (+0000)
Subject: | NOT & YOU BASTARD
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=e71fb6c66e2b08e1acca087448d99a226aa077f0;hp=07305ec7188fd44f7b6543a3f1f53bc0db3b090d;p=chaz%2Fopenbox

| NOT & YOU BASTARD
---

diff --git a/otk/surface.cc b/otk/surface.cc
index b7aadd0f..cc225503 100644
--- 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;