3 files changed, 28 insertions, 4 deletions

diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc
index ae92e97..63881d3 100644
--- a/src/FbTk/XLayer.cc
+++ b/src/FbTk/XLayer.cc
@@ -131,6 +131,26 @@ void XLayer::stackBelowItem(XLayerItem *item, XLayerItem *above) {
     
 }
 
+void XLayer::alignItem(XLayerItem &item) {
+    // Note: some other things effectively assume that the window list is 
+    // sorted from highest to lowest
+    size_t winnum = 0, 
+        num = item.numWindows();
+    Window *winlist = new Window[num];
+
+    // fill the rest of the array
+    XLayerItem::Windows::iterator it = item.getWindows().begin();
+    XLayerItem::Windows::iterator it_end = item.getWindows().end();
+    for (; it != it_end; ++it) {
+        if ((*it)->window()) {
+            winlist[winnum++] = (*it)->window();
+        }
+    }
+
+    XRestackWindows(FbTk::App::instance()->display(), winlist, winnum);
+    delete [] winlist;
+}
+
 XLayer::iterator XLayer::insert(XLayerItem &item, unsigned int pos) {
 #ifdef DEBUG
     // at this point we don't support insertions into a layer other than at the top
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh
index d01094e..bed93cc 100644
--- a/src/FbTk/XLayer.hh
+++ b/src/FbTk/XLayer.hh
@@ -48,6 +48,8 @@ public:
     void setLayerNum(int layernum) { m_layernum = layernum; };
     int  getLayerNum() { return m_layernum; };
     void restack();
+    // Put all items on the same layer (called when layer item added to)
+    void alignItem(XLayerItem &item);
     int countWindows();
     void stackBelowItem(XLayerItem *item, XLayerItem *above);
     XLayerItem *getLowestItem();
diff --git a/src/FbTk/XLayerItem.cc b/src/FbTk/XLayerItem.cc
index eb88aa8..95befe7 100644
--- a/src/FbTk/XLayerItem.cc
+++ b/src/FbTk/XLayerItem.cc
@@ -81,9 +81,10 @@ void XLayerItem::moveToLayer(int layernum) {
 }
 
 void XLayerItem::addWindow(FbWindow &win) {
-  // I'd like to think we can trust ourselves that it won't be added twice...
-  // Otherwise we're always scanning through the list.
-  m_windows.push_back(&win);
+    // I'd like to think we can trust ourselves that it won't be added twice...
+    // Otherwise we're always scanning through the list.
+    m_windows.push_back(&win);
+    m_layer->alignItem(*this);
 }
 
 void XLayerItem::removeWindow(FbWindow &win) {
@@ -91,7 +92,8 @@ void XLayerItem::removeWindow(FbWindow &win) {
   // Otherwise we're always scanning through the list.
 
   XLayerItem::Windows::iterator it = std::find(m_windows.begin(), m_windows.end(), &win);
-  m_windows.erase(it);
+  if (it != m_windows.end())
+      m_windows.erase(it);
 }
 
 void XLayerItem::bringToTop(FbWindow &win) {