Don't show the desktop menubar when a full-screen app is shown.
svn path=/trunk/kdebase/kwin/; revision=157263
This commit is contained in:
parent
e0daa02a8f
commit
1448e53da5
1 changed files with 7 additions and 2 deletions
|
@ -1379,14 +1379,19 @@ void Workspace::setActiveClient( Client* c )
|
||||||
|
|
||||||
// show the new menu bar first...
|
// show the new menu bar first...
|
||||||
Client* menubar = 0;
|
Client* menubar = 0;
|
||||||
|
bool has_full_screen = false;
|
||||||
for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
|
for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
|
||||||
if ( (*it)->isMenu() && (*it)->mainClient() == main ) {
|
if ( (*it)->isMenu() && (*it)->mainClient() == main ) {
|
||||||
menubar = *it;
|
menubar = *it;
|
||||||
break;
|
}
|
||||||
|
if ( (*it)->isVisible() && (*it)->isFullScreen() &&
|
||||||
|
!(*it)->isDesktop() && (*it)->staysOnTop() ) {
|
||||||
|
has_full_screen = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( !menubar )
|
if ( !menubar && !has_full_screen)
|
||||||
{
|
{
|
||||||
|
// Find the menubar of the desktop
|
||||||
if ( desktops.isEmpty() ) {
|
if ( desktops.isEmpty() ) {
|
||||||
for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
|
for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
|
||||||
if ( (*it)->isMenu() && (*it)->mainClient() == (*it) ) {
|
if ( (*it)->isMenu() && (*it)->mainClient() == (*it) ) {
|
||||||
|
|
Loading…
Reference in a new issue