Changeset View
Changeset View
Standalone View
Standalone View
abstract_client.cpp
Show First 20 Lines • Show All 469 Lines • ▼ Show 20 Line(s) | 422 | { | |||
---|---|---|---|---|---|
470 | if (isModal()) // if a modal dialog is moved, move the mainwindow with it as otherwise | 470 | if (isModal()) // if a modal dialog is moved, move the mainwindow with it as otherwise | ||
471 | // the (just moved) modal dialog will confusingly return to the mainwindow with | 471 | // the (just moved) modal dialog will confusingly return to the mainwindow with | ||
472 | // the next desktop change | 472 | // the next desktop change | ||
473 | { | 473 | { | ||
474 | foreach (AbstractClient * c2, mainClients()) | 474 | foreach (AbstractClient * c2, mainClients()) | ||
475 | c2->setDesktops(desktops); | 475 | c2->setDesktops(desktops); | ||
476 | } | 476 | } | ||
477 | 477 | | |||
478 | doSetDesktop(desktop(), was_desk); | 478 | doSetDesktop(); | ||
479 | 479 | | |||
480 | FocusChain::self()->update(this, FocusChain::MakeFirst); | 480 | FocusChain::self()->update(this, FocusChain::MakeFirst); | ||
481 | updateWindowRules(Rules::Desktop); | 481 | updateWindowRules(Rules::Desktop); | ||
482 | 482 | | |||
483 | emit desktopChanged(); | 483 | emit desktopChanged(); | ||
484 | if (wasOnCurrentDesktop != isOnCurrentDesktop()) | 484 | if (wasOnCurrentDesktop != isOnCurrentDesktop()) | ||
485 | emit desktopPresenceChanged(this, was_desk); | 485 | emit desktopPresenceChanged(this, was_desk); | ||
486 | emit x11DesktopIdsChanged(); | 486 | emit x11DesktopIdsChanged(); | ||
487 | } | 487 | } | ||
488 | 488 | | |||
489 | void AbstractClient::doSetDesktop(int desktop, int was_desk) | 489 | void AbstractClient::doSetDesktop() | ||
490 | { | 490 | { | ||
491 | Q_UNUSED(desktop) | | |||
492 | Q_UNUSED(was_desk) | | |||
493 | } | 491 | } | ||
494 | 492 | | |||
495 | void AbstractClient::enterDesktop(VirtualDesktop *virtualDesktop) | 493 | void AbstractClient::enterDesktop(VirtualDesktop *virtualDesktop) | ||
496 | { | 494 | { | ||
497 | if (m_desktops.contains(virtualDesktop)) { | 495 | if (m_desktops.contains(virtualDesktop)) { | ||
498 | return; | 496 | return; | ||
499 | } | 497 | } | ||
500 | auto desktops = m_desktops; | 498 | auto desktops = m_desktops; | ||
▲ Show 20 Lines • Show All 2621 Lines • Show Last 20 Lines |