summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Frank Erikson <kristian@kristian-desktop.(none)>2008-11-20 22:17:18 +1300
committerKristian Frank Erikson <kristian@kristian-desktop.(none)>2008-11-20 22:17:18 +1300
commita35c4642a77325e82ed3ae9f7df5978142e868f3 (patch)
treeda268cdba59ee20938096853bfdc59fe403e5bdf
parentd024ad89e2d74c4ea8e4611c7477e96ecd103283 (diff)
downloadcf-squeeze-a35c4642a77325e82ed3ae9f7df5978142e868f3.tar.gz
cf-squeeze-a35c4642a77325e82ed3ae9f7df5978142e868f3.tar.bz2
Added hack to wait with OpenGL scale till resize catches up
-rw-r--r--squeeze.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/squeeze.c b/squeeze.c
index 18cfadf..b66cf62 100644
--- a/squeeze.c
+++ b/squeeze.c
@@ -399,13 +399,8 @@ squeezePreparePaintScreen (CompScreen *s,
if (sw->resizeAnimActive & !sw->putAnimActive)
{
sw->resizeAnimActive = adjustSqueezeResize (w);
- /*
- if (!sw->resizeAnimActive)
- {
-
- }*/
- // Make sure animation flag stays on
+ // Make sure animation flag stays on while it needs to
ss->animationsActive |= sw->resizeAnimActive;
}
}
@@ -523,7 +518,13 @@ squeezePaintWindow (CompWindow *w,
xOrigin = w->attrib.x - w->input.left;
yOrigin = w->attrib.y - w->input.top;
- matrixTranslate (&wTransform, sw->tx - w->input.left, sw->ty - w->input.top, 0.0f);
+ // Hack to sort out window resize flicker
+ if (sw->targetWidth == w->attrib.width)
+ {
+ matrixTranslate (&wTransform, sw->targetX,
+ sw->targetY, 0.0f);
+ }
+
matrixScale (&wTransform, xScale, yScale, 1.0f);
matrixTranslate (&wTransform,
(sw->targetX) / xScale - xOrigin,