yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ignore dockers for showingDesktop state

Browse source 
also use a common funciton to decide whether or
not to break the state

BUG: 305874
FIXED-IN: 4.9.1
This commit is contained in:
Thomas Lübking 2012-08-26 16:16:38 +02:00
parent 3460d5b551
commit 7d2e62b487
3 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
client.cpp
View file

@ -1210,21 +1210,25 @@ void Client::updateVisibility()
internalHide(Allowed);
return;
}
if( workspace()->showingDesktop()) {
bool belongs_to_desktop = false;
for (ClientList::ConstIterator it = group()->members().constBegin();
it != group()->members().constEnd();
++it)
if ((*it)->isDesktop()) {
belongs_to_desktop = true;
break;
}
if (!belongs_to_desktop)
workspace()->resetShowingDesktop(true);
}
resetShowingDesktop(true);
internalShow(Allowed);
}
void Client::resetShowingDesktop(bool keep_hidden)
{
if (isDock() || !workspace()->showingDesktop())
return;
bool belongs_to_desktop = false;
for (ClientList::ConstIterator it = group()->members().constBegin(),
end = group()->members().constEnd(); it != end; ++it)
if ((belongs_to_desktop == (*it)->isDesktop()))
break;
if (!belongs_to_desktop)
workspace()->resetShowingDesktop(keep_hidden);
}
/**
* Sets the client window's mapping state. Possible values are
* WithdrawnState, IconicState, NormalState.

1
client.h
View file

@ -682,6 +682,7 @@ private:
bool processDecorationButtonPress(int button, int state, int x, int y, int x_root, int y_root,
bool ignoreMenu = false);
Client* findAutogroupCandidate() const;
void resetShowingDesktop(bool keep_hidden);
protected:
virtual void debug(QDebug& stream) const;

11
manage.cpp
View file

@ -558,16 +558,7 @@ bool Client::manage(Window w, bool isMapped)
}
}
bool belongs_to_desktop = false;
for (ClientList::ConstIterator it = group()->members().constBegin();
it != group()->members().constEnd();
++it)
if ((*it)->isDesktop()) {
belongs_to_desktop = true;
break;
}
if (!belongs_to_desktop && workspace()->showingDesktop())
workspace()->resetShowingDesktop(options->isShowDesktopIsMinimizeAll());
resetShowingDesktop(options->isShowDesktopIsMinimizeAll());
if (isOnCurrentDesktop() && !isMapped && !allow && (!session || session->stackingOrder < 0))
workspace()->restackClientUnderActive(this);