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

Merge branch 'Plasma/5.4'

Browse source
This commit is contained in:
Thomas Lübking 2015-10-23 09:38:50 +02:00
commit 8ad51527a8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
manage.cpp
View file

@ -193,8 +193,10 @@ bool Client::manage(xcb_window_t w, bool isMapped)
for (auto it = mainclients.constBegin();
it != mainclients.constEnd();
++it) {
if (mainclients.count() > 1 && (*it)->isSpecialWindow())
continue; // Don't consider toolbars etc when placing
if (mainclients.count() > 1 && // A group-transient
(*it)->isSpecialWindow() && // Don't consider toolbars etc when placing
!(info->state() & NET::Modal)) // except when it's modal (blocks specials as well)
continue;
maincl = *it;
if ((*it)->isOnCurrentDesktop())
on_current = true;
@ -210,11 +212,12 @@ bool Client::manage(xcb_window_t w, bool isMapped)
if (maincl)
setOnActivities(maincl->activities());
} else { // a transient shall appear on its leader and not drag that around
if (info->desktop())
desk = info->desktop(); // Window had the initial desktop property, force it
if (desktop() == 0 && asn_valid && asn_data.desktop() != 0)
desk = asn_data.desktop();
}
if (info->desktop())
desk = info->desktop(); // Window had the initial desktop property, force it
if (desktop() == 0 && asn_valid && asn_data.desktop() != 0)
desk = asn_data.desktop();
#ifdef KWIN_BUILD_ACTIVITIES
if (Activities::self() && !isMapped && !noborder && isNormalWindow() && !activitiesDefined) {
//a new, regular window, when we're not recovering from a crash,