summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-15 18:36:08 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-15 18:36:08 +0000
commit0f2ef70050b891f26b9cc0317299c35381c36203 (patch)
tree9116a11b920d1bd2d0f55d576bf36b229bd7da30
parent5d3fd210022b69328ba7b7e042a52731c4f9d9ad (diff)
downloadmarex-dev-0f2ef70050b891f26b9cc0317299c35381c36203.tar.gz
marex-dev-0f2ef70050b891f26b9cc0317299c35381c36203.tar.bz2
water plugin: slight simplification
git-svn-id: file:///beryl/trunk@4086 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--beryl-plugins/src/water.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/beryl-plugins/src/water.c b/beryl-plugins/src/water.c
index 97fc8dc..faa5f6b 100644
--- a/beryl-plugins/src/water.c
+++ b/beryl-plugins/src/water.c
@@ -1025,18 +1025,11 @@ waterDrawWindowTexture(CompWindow * w,
WATER_SCREEN(w->screen);
Bool drawIt = TRUE;
- if (ws->current.w && (w->id == ws->current.w->id))
- {
- UNWRAP(ws, w->screen, drawWindowTexture);
- (*w->screen->drawWindowTexture) (w, texture, fAttrib, mask);
- WRAP(ws, w->screen, drawWindowTexture, waterDrawWindowTexture);
-
- return;
- }
-
if (ws->current.w)
{
- if ((w->screen->x != ws->current.vpX) || (w->screen->y != ws->current.vpY))
+ if (w->id == ws->current.w->id)
+ drawIt = FALSE;
+ else if ((w->screen->x != ws->current.vpX) || (w->screen->y != ws->current.vpY))
drawIt = FALSE;
}