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