summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-13 07:52:23 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-13 07:52:23 +0000
commitde89650b0863c582d1e9b9ace4ee5cf1bc2af576 (patch)
tree2af15d995cfe992376927274cfbaa5027907a2c3
parent6f2ce07a1d85c262cb9e7375f387eaaf3bed9a19 (diff)
downloadmarex-dev-de89650b0863c582d1e9b9ace4ee5cf1bc2af576.tar.gz
marex-dev-de89650b0863c582d1e9b9ace4ee5cf1bc2af576.tar.bz2
switcher:
* hide active window too during ring switcher mode (should be made optional in the future) cube: * apply patch from previous rev to trunk, fixes cube caps being jumpy git-svn-id: file:///beryl/trunk@4015 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--beryl-plugins/src/cube.c2
-rw-r--r--beryl-plugins/src/switcher.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/beryl-plugins/src/cube.c b/beryl-plugins/src/cube.c
index 36436f4..d2289d9 100644
--- a/beryl-plugins/src/cube.c
+++ b/beryl-plugins/src/cube.c
@@ -2491,11 +2491,11 @@ cubePaintTransformedScreen(CompScreen * s,
else
{
glNormal3f(0.0, 1.0, 0.0);
+ glRotatef(360.0f-(360.0f/(float)hsize), 0.0f, 1.0f, 0.0f);
cubeDrawCubeCap(s, hsize, 0,
&cs->cubeCapTop,
&cs->cubeCapBottom, cs->desktopOpacity);
- glRotatef(360.0f-(360.0f/(float)hsize), 0.0f, 1.0f, 0.0f);
glNormal3f(0.0, 1.0, 0.0);
cubeDrawCubeCap(s, hsize,
cs->nvertices >> 1,
diff --git a/beryl-plugins/src/switcher.c b/beryl-plugins/src/switcher.c
index 71a7420..b855986 100644
--- a/beryl-plugins/src/switcher.c
+++ b/beryl-plugins/src/switcher.c
@@ -2314,6 +2314,7 @@ switchPaintWindow(CompWindow * w,
{
CompTransform wTransform = *transform;
+ WindowPaintAttrib sAttrib = *attrib;
if (ss->bringToFront)
{
if ((ss->selectedWindow == ss->zoomedWindow) &&
@@ -2326,8 +2327,11 @@ switchPaintWindow(CompWindow * w,
}
}
+ if ( ((ss->wMask & w->type) && ss->opacity != OPAQUE)&&(ss->opt[SWITCH_SCREEN_OPTION_RING_TRANSPARENT_ALL].value.b && (ss->switchMode == RingSwitcher )))
+ sAttrib.opacity = 0;
+
UNWRAP(ss, s, paintWindow);
- status = (*s->paintWindow) (w, attrib, &wTransform, region, mask);
+ status = (*s->paintWindow) (w, &sAttrib, &wTransform, region, mask);
WRAP(ss, s, paintWindow, switchPaintWindow);