summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoi Cohen <roico@roico-desktop.(none)>2007-04-20 17:45:37 +0300
committerRoi Cohen <roico@roico-desktop.(none)>2007-04-20 17:45:37 +0300
commit762675fd9e0600070001909908488bb44a442d0c (patch)
tree5d59ffcb4bf58d291f2f334f1f5bb07650601199
parentcb39b6968deeda54b69264f4f4eb5dcf7cb2887b (diff)
downloadberyl-premerge-762675fd9e0600070001909908488bb44a442d0c.tar.gz
beryl-premerge-762675fd9e0600070001909908488bb44a442d0c.tar.bz2
fixed width's max value.
fixed a problem with the makefile. don't 3dize skipPager / skipTaskbar windows
-rw-r--r--src/3d/3d.c4
-rw-r--r--src/3d/3d.xml2
-rw-r--r--src/3d/Makefile2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/3d/3d.c b/src/3d/3d.c
index 902f3d6..d9fdfe0 100644
--- a/src/3d/3d.c
+++ b/src/3d/3d.c
@@ -191,6 +191,9 @@ static Bool windowIs3D(CompWindow * w)
(w->state & CompWindowStateStickyMask && !(w->state & CompWindowStateBelowMask)))
return FALSE;
+ if (w->state & (CompWindowStateSkipPagerMask | CompWindowStateSkipTaskbarMask))
+ return FALSE;
+
if (!matchEval(tdGetWindowMatch(w->screen), w))
return FALSE;
@@ -1083,6 +1086,7 @@ static Bool tdInitScreen(CompPlugin * p, CompScreen * s)
tds->rotationMode = NoRotation;
tds->insideCube = FALSE;
tds->sticky = FALSE;
+ tds->cubeUnfolded = FALSE;
tds->currentViewportNum = s->hsize;
tds->currentScreenNum = s->nOutputDev;
diff --git a/src/3d/3d.xml b/src/3d/3d.xml
index c908ece..b6a2c94 100644
--- a/src/3d/3d.xml
+++ b/src/3d/3d.xml
@@ -30,7 +30,7 @@
<long>Window width</long>
<default>0.3</default>
<min>0.0</min>
- <max>0.01</max>
+ <max>1.0</max>
<precision>0.001</precision>
</option>
<option name="mipmaps" type="bool">
diff --git a/src/3d/Makefile b/src/3d/Makefile
index 80c4726..2c2560e 100644
--- a/src/3d/Makefile
+++ b/src/3d/Makefile
@@ -87,7 +87,7 @@ $(BUILDDIR) :
@mkdir -p $(BUILDDIR)
$(DESTDIR) :
- @mkdir -p q$(DESTDIR)
+ @mkdir -p $(DESTDIR)
#
# BCOP'ing