summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/resize.c
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-13 15:06:58 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-13 15:06:58 +0000
commit7ce11ba5af6d14d8b23ab285d182a1a97f5340ae (patch)
tree8d0c0ed4ba995dd2b4c291ced4e7043f4aef40ac /beryl-plugins/src/resize.c
parent868ace49a7c29a5d6e6803ea5643153ce7a4cb36 (diff)
downloadmarex-dev-7ce11ba5af6d14d8b23ab285d182a1a97f5340ae.tar.gz
marex-dev-7ce11ba5af6d14d8b23ab285d182a1a97f5340ae.tar.bz2
resize plugin: fixed outline drawing for non-transparent cube
git-svn-id: file:///beryl/trunk@1720 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/resize.c')
-rw-r--r--beryl-plugins/src/resize.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/beryl-plugins/src/resize.c b/beryl-plugins/src/resize.c
index befc67a..ed53dac 100644
--- a/beryl-plugins/src/resize.c
+++ b/beryl-plugins/src/resize.c
@@ -971,8 +971,7 @@ static void resizePaintOutline (CompScreen *s, const ScreenPaintAttrib *sa, int
RESIZE_DISPLAY (s->display);
if (rd->resizeMode > ResizeModeStretch && rd->w &&
- !(rd->w->state & MAXIMIZE_STATE) &&
- (!rs->wasTransformed || transformed)) {
+ !(rd->w->state & MAXIMIZE_STATE)) {
if (transformed)
rs->wasTransformed = TRUE;
@@ -989,7 +988,7 @@ static void resizePaintOutline (CompScreen *s, const ScreenPaintAttrib *sa, int
(s->applyScreenTransform) (s, sa, output);
}
- prepareXCoords(s, output, -sa->zTranslate);
+ prepareXCoords(s, output, transformed ? -sa->zTranslate : -DEFAULT_Z_CAMERA);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glEnable(GL_BLEND);
@@ -1030,7 +1029,8 @@ static Bool resizePaintScreen(CompScreen * s,
status = (*s->paintScreen) (s, sAttrib, region, output, mask);
WRAP(rs, s, paintScreen, resizePaintScreen);
- resizePaintOutline (s, sAttrib, output, FALSE);
+ if (status && !rs->wasTransformed)
+ resizePaintOutline (s, sAttrib, output, FALSE);
return status;
}