summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moreau <oreaus@gmail.com>2011-11-01 07:17:13 -0600
committerScott Moreau <oreaus@gmail.com>2011-11-01 07:17:13 -0600
commitcf47a92f29866e0830441c8d8093c24e21e7a2fd (patch)
tree3cc62fa4d582c05e5093581416eec5d993f23833
parente676f1b12eb8db3a76978eed5bfc7c2cf9a0b6ce (diff)
downloadcore-cf47a92f29866e0830441c8d8093c24e21e7a2fd.tar.gz
core-cf47a92f29866e0830441c8d8093c24e21e7a2fd.tar.bz2
Revert "Fix typoes". This commit does not fix typoes but makes changes for reasons not announced by the commit message. This fixes http://bugs.compiz.org/show_bug.cgi?id=51
This reverts commit 2a7cd9b94097a59f1074697ef7dac25b9ccd4a5c.
-rw-r--r--src/screen.cpp3
-rw-r--r--src/window.cpp10
2 files changed, 13 insertions, 0 deletions
diff --git a/src/screen.cpp b/src/screen.cpp
index f5568f5..e0ab677 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -3525,6 +3525,9 @@ CompScreen::moveViewport (int tx, int ty, bool sync)
xwc.x = w->serverGeometry ().x () + pnt.x ();
xwc.y = w->serverGeometry ().y () + pnt.y ();
+ /* move */
+ w->move (pnt.x (), pnt.y ());
+
w->configureXWindow (valueMask, &xwc);
}
diff --git a/src/window.cpp b/src/window.cpp
index 2eef8cc..b69c042 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -5891,9 +5891,13 @@ CompWindow::moveToViewportPosition (int x,
if (priv->saveMask & CWY)
priv->saveWc.y += wy;
+ move (wx, wy);
xwc.x = serverGeometry ().x () + wx;
xwc.y = serverGeometry ().y () + wy;
+ if (sync)
+ syncPosition ();
+
configureXWindow (valueMask, &xwc);
}
}
@@ -6106,6 +6110,12 @@ CompWindow::CompWindow (Window aboveId,
priv->serverGeometry.set (priv->attrib.x, priv->attrib.y,
priv->attrib.width, priv->attrib.height,
priv->attrib.border_width);
+ priv->syncGeometry.set (priv->attrib.x, priv->attrib.y,
+ priv->attrib.width, priv->attrib.height,
+ priv->attrib.border_width);
+ priv->geometry.set (priv->attrib.x, priv->attrib.y,
+ priv->attrib.width, priv->attrib.height,
+ priv->attrib.border_width);
priv->serverFrameGeometry = priv->frameGeometry = priv->syncGeometry
= priv->geometry = priv->serverGeometry;