BlackboxWindowList::const_reverse_iterator it = stackingList.rbegin();
const BlackboxWindowList::const_reverse_iterator end = stackingList.rend();
for (; it != end; ++it)
- if ((*it)->isNormal())
+ // don't add desktop wnidows, or sticky windows more than once
+ if (! ( (*it)->isDesktop() ||
+ ((*it)->isStuck() && id != screen->getCurrentWorkspaceID())))
stack_order.push_back(*it);
}
RectList availableAreas = screen->allAvailableAreas();
RectList::iterator it, end = availableAreas.end();
- for (it = availableAreas.begin(); it != end; ++it)
+ for (it = availableAreas.begin(); it != end; ++it) {
+ Rect r = *it;
+ r.setRect(r.x() + screen->getSnapOffset(),
+ r.y() + screen->getSnapOffset(),
+ r.width() - screen->getSnapOffset(),
+ r.height() - screen->getSnapOffset());
spaces.push_back(*it);
+ }
} else
#endif // XINERAMA
- spaces.push_back(screen->availableArea());
+ {
+ Rect r = screen->availableArea();
+ r.setRect(r.x() + screen->getSnapOffset(),
+ r.y() + screen->getSnapOffset(),
+ r.width() - screen->getSnapOffset(),
+ r.height() - screen->getSnapOffset());
+ spaces.push_back(r);
+ }
//Find Free Spaces
BlackboxWindowList::const_iterator wit = windowList.begin(),