summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-29 03:36:12 +0000
committerDana Jansens <danakj@orodu.net>2007-05-29 03:36:12 +0000
commit28ad33fd5fccec49935bf94d25ee3cd5f2d3d9b9 (patch)
tree0d88321bc80d8422b38c60dbabf11fe297487771
parent5e98d8a4523b41ff29adac675ec40f8e8699fcec (diff)
brackets ftw. opacity for rgba's works.
-rw-r--r--openbox/focus_cycle_popup.c2
-rw-r--r--render/image.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 7d132b6a..0bfe9b6b 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -424,7 +424,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
p->a_icon->texture[0].data.rgba.height = icon->height;
if (target->client->iconic)
/* 7/16 alpha */
- p->a_icon->texture[0].data.rgba.alpha = (0xff>>1 - 0xff>>4);
+ p->a_icon->texture[0].data.rgba.alpha = (0xff>>1) - (0xff>>4);
else
p->a_icon->texture[0].data.rgba.alpha = 0xff;
p->a_icon->texture[0].data.rgba.data = icon->data;
diff --git a/render/image.c b/render/image.c
index 1e76e6ba..e6e8b8b9 100644
--- a/render/image.c
+++ b/render/image.c
@@ -153,7 +153,7 @@ void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba,
guchar alpha, r, g, b, bgr, bgg, bgb;
/* apply the rgba's opacity as well */
- alpha = ((*source >> RrDefaultAlphaOffset) * rgba->alpha >> 8) & 0xff;
+ alpha = (((*source >> RrDefaultAlphaOffset) * rgba->alpha) >> 8)&0xff;
r = *source >> RrDefaultRedOffset;
g = *source >> RrDefaultGreenOffset;
b = *source >> RrDefaultBlueOffset;