Merged improve-standalone-window-manager into alt-to-scroll.

(bzr r3096.4.5)

1 files changed, 4 insertions, 4 deletions

diff --git a/unity-shared/StandaloneWindowManager.cpp b/unity-shared/StandaloneWindowManager.cpp
index 2877be049..f0dffdf46 100644
--- a/unity-shared/StandaloneWindowManager.cpp
+++ b/unity-shared/StandaloneWindowManager.cpp
@@ -310,7 +310,7 @@ void StandaloneWindowManager::Activate(Window window_id)
 window->active = true;
 }
 
-void StandaloneWindowManager::Raise(Window window_id)
+void StandaloneWindowManager::Lower(Window window_id)
 {
 auto begin = standalone_windows_.begin();
 auto end = standalone_windows_.end();
@@ -322,7 +322,7 @@ void StandaloneWindowManager::Raise(Window window_id)
 standalone_windows_.splice(begin, standalone_windows_, window);
 }
 
-void StandaloneWindowManager::Lower(Window window_id)
+void StandaloneWindowManager::Raise(Window window_id)
 {
 auto end = standalone_windows_.end();
 auto window = std::find_if(standalone_windows_.begin(), end, [window_id] (StandaloneWindow::Ptr window) {
@@ -346,7 +346,7 @@ void StandaloneWindowManager::RestackBelow(Window window_id, Window sibiling_id)
 });
 
 if (window != end && sibiling != end)
- standalone_windows_.splice(std::next(sibiling), standalone_windows_, window);
+ standalone_windows_.splice(sibiling, standalone_windows_, window);
 }
 
 void StandaloneWindowManager::TerminateScale()
@@ -558,7 +558,7 @@ void StandaloneWindowManager::AddStandaloneWindow(StandaloneWindow::Ptr const& w
 
 auto xid = window->Xid();
 Close(xid);
- standalone_windows_.push_back(window);
+ standalone_windows_.push_front(window);
 
 window->mapped.changed.connect([this, xid] (bool v) {v ? window_mapped(xid) : window_unmapped(xid);});
 window->visible.changed.connect([this, xid] (bool v) {v ? window_shown(xid) : window_hidden(xid);});