Revert "Move keep-above clients to the Normal layer when showing desktop"

This reverts commit 1e2a0028c3.

Unfortunately, we can't move clients from the above layer to the normal
layer because some of those clients have to be visible when showing
desktop, one such client for example is krunner.

CCBUG: 406101
icc-effect-5.17.5
Vlad Zagorodniy 2019-04-16 11:06:41 +03:00
parent af862a9caf
commit 8010e076ee
2 changed files with 2 additions and 4 deletions

View File

@ -374,7 +374,7 @@ Layer AbstractClient::belongsToLayer() const
if (isActiveFullScreen())
return ActiveLayer;
if (keepAbove())
return workspace()->showingDesktop() ? NormalLayer : AboveLayer;
return AboveLayer;
return NormalLayer;
}

View File

@ -1276,9 +1276,7 @@ void Workspace::setShowingDesktop(bool showing)
for (int i = stacking_order.count() - 1; i > -1; --i) {
AbstractClient *c = qobject_cast<AbstractClient*>(stacking_order.at(i));
if (c && c->isOnCurrentDesktop()) {
// When showing desktop we'd like to raise docks above desktop
// windows and move keep-above clients to the normal layer.
if (c->isDock() || c->keepAbove()) {
if (c->isDock()) {
c->updateLayer();
} else if (c->isDesktop() && c->isShown(true)) {
c->updateLayer();