summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-03-15 00:07:54 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-03-15 00:07:54 +0800
commit936ea91ee441c451be859b805386af3946b02a41 (patch)
tree56bf01a0d9787b17c841f77308c7aab56cc3443d
parent9bf34ec73982e2d8b6fa7deedb3c5b9a375a04b5 (diff)
downloadwall-936ea91ee441c451be859b805386af3946b02a41.tar.gz
wall-936ea91ee441c451be859b805386af3946b02a41.tar.bz2
Revert "Update for new core API"
This reverts commit 9bf34ec73982e2d8b6fa7deedb3c5b9a375a04b5.
-rw-r--r--src/wall.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wall.cpp b/src/wall.cpp
index 430c6d6..4c14821 100644
--- a/src/wall.cpp
+++ b/src/wall.cpp
@@ -596,7 +596,6 @@ WallScreen::positionUpdate (const CompPoint &pos)
poller.stop ();
toggleEdges (true);
}
-
}
void
@@ -632,7 +631,7 @@ WallWindow::grabNotify (int x,
unsigned int width,
unsigned int height)
{
- //WallScreen::get (screen)->toggleEdges (true);
+ WallScreen::get (screen)->toggleEdges (true);
WallScreen::get (screen)->edgeDrag = true;
window->grabNotify (x, y, width, height);
@@ -811,7 +810,7 @@ WallScreen::initiateFlip (Direction direction,
}
else if (!optionGetEdgeflipPointer ())
{
- //toggleEdges (false);
+ toggleEdges (false);
poller.start ();
return false;
}
@@ -1524,7 +1523,7 @@ WallScreen::toggleEdges (bool enabled)
{
WALL_SCREEN (screen);
- if (false)
+ if (!enabled)
{
screen->removeAction (&ws->optionGetFlipLeftEdge ());
screen->removeAction (&ws->optionGetFlipUpEdge ());