Changeset View
Changeset View
Standalone View
Standalone View
x11client.cpp
Show First 20 Lines • Show All 512 Lines • ▼ Show 20 Line(s) | 512 | if (maincl) | |||
---|---|---|---|---|---|
513 | setOnActivities(maincl->activities()); | 513 | setOnActivities(maincl->activities()); | ||
514 | } else { // a transient shall appear on its leader and not drag that around | 514 | } else { // a transient shall appear on its leader and not drag that around | ||
515 | if (info->desktop()) | 515 | if (info->desktop()) | ||
516 | desk = info->desktop(); // Window had the initial desktop property, force it | 516 | desk = info->desktop(); // Window had the initial desktop property, force it | ||
517 | if (desktop() == 0 && asn_valid && asn_data.desktop() != 0) | 517 | if (desktop() == 0 && asn_valid && asn_data.desktop() != 0) | ||
518 | desk = asn_data.desktop(); | 518 | desk = asn_data.desktop(); | ||
519 | } | 519 | } | ||
520 | #ifdef KWIN_BUILD_ACTIVITIES | 520 | #ifdef KWIN_BUILD_ACTIVITIES | ||
521 | if (Activities::self() && !isMapped && !noborder && isNormalWindow() && !activitiesDefined) { | 521 | if (Activities::self() && !isMapped && !skipTaskbar() && isNormalWindow() && !activitiesDefined) { | ||
522 | //a new, regular window, when we're not recovering from a crash, | 522 | //a new, regular window, when we're not recovering from a crash, | ||
523 | //and it hasn't got an activity. let's try giving it the current one. | 523 | //and it hasn't got an activity. let's try giving it the current one. | ||
524 | //TODO: decide whether to keep this before the 4.6 release | 524 | //TODO: decide whether to keep this before the 4.6 release | ||
525 | //TODO: if we are keeping it (at least as an option), replace noborder checking | 525 | //TODO: if we are keeping it (at least as an option), replace noborder checking | ||
526 | //with a public API for setting windows to be on all activities. | 526 | //with a public API for setting windows to be on all activities. | ||
527 | //something like KWindowSystem::setOnAllActivities or | 527 | //something like KWindowSystem::setOnAllActivities or | ||
528 | //KActivityConsumer::setOnAllActivities | 528 | //KActivityConsumer::setOnAllActivities | ||
529 | setOnActivity(Activities::self()->current(), true); | 529 | setOnActivity(Activities::self()->current(), true); | ||
▲ Show 20 Lines • Show All 4519 Lines • Show Last 20 Lines |