change dock to use a Rect area instead of four ints

[chaz/openbox] / render / image.c

diff --git a/render/image.c b/render/image.c
index 3c08444db14116ddf32f604fcc7d262cb8711358..4b1230406fc2a171b5f4bdbad3b67a3cc38aa332 100644 (file)
--- a/render/image.c
+++ b/render/image.c
@@ -152,7 +152,8 @@ void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba,
     while (num_pixels-- > 0) {
         guchar alpha, r, g, b, bgr, bgg, bgb;
 
-        alpha = *source >> RrDefaultAlphaOffset;
+        /* apply the rgba's opacity as well */
+        alpha = ((*source >> RrDefaultAlphaOffset) * rgba->alpha) >> 8;
         r = *source >> RrDefaultRedOffset;
         g = *source >> RrDefaultGreenOffset;
         b = *source >> RrDefaultBlueOffset;