Changeset View
Changeset View
Standalone View
Standalone View
workspace.cpp
Show First 20 Lines • Show All 673 Lines • ▼ Show 20 Line(s) | 666 | { | |||
---|---|---|---|---|---|
674 | 674 | | |||
675 | if (client_keys_client == c) | 675 | if (client_keys_client == c) | ||
676 | setupWindowShortcutDone(false); | 676 | setupWindowShortcutDone(false); | ||
677 | if (!c->shortcut().isEmpty()) { | 677 | if (!c->shortcut().isEmpty()) { | ||
678 | c->setShortcut(QString()); // Remove from client_keys | 678 | c->setShortcut(QString()); // Remove from client_keys | ||
679 | clientShortcutUpdated(c); // Needed, since this is otherwise delayed by setShortcut() and wouldn't run | 679 | clientShortcutUpdated(c); // Needed, since this is otherwise delayed by setShortcut() and wouldn't run | ||
680 | } | 680 | } | ||
681 | 681 | | |||
682 | #ifdef KWIN_BUILD_TABBOX | | |||
683 | TabBox::TabBox *tabBox = TabBox::TabBox::self(); | | |||
684 | if (tabBox->isDisplayed() && tabBox->currentClient() == c) | | |||
685 | tabBox->nextPrev(true); | | |||
686 | #endif | | |||
687 | | ||||
688 | Q_ASSERT(clients.contains(c) || desktops.contains(c)); | 682 | Q_ASSERT(clients.contains(c) || desktops.contains(c)); | ||
689 | // TODO: if marked client is removed, notify the marked list | 683 | // TODO: if marked client is removed, notify the marked list | ||
690 | clients.removeAll(c); | 684 | clients.removeAll(c); | ||
691 | m_allClients.removeAll(c); | 685 | m_allClients.removeAll(c); | ||
692 | desktops.removeAll(c); | 686 | desktops.removeAll(c); | ||
693 | markXStackingOrderAsDirty(); | 687 | markXStackingOrderAsDirty(); | ||
694 | attention_chain.removeAll(c); | 688 | attention_chain.removeAll(c); | ||
695 | Group* group = findGroup(c->window()); | 689 | Group* group = findGroup(c->window()); | ||
Show All 9 Lines | |||||
705 | if (c == delayfocus_client) | 699 | if (c == delayfocus_client) | ||
706 | cancelDelayFocus(); | 700 | cancelDelayFocus(); | ||
707 | 701 | | |||
708 | emit clientRemoved(c); | 702 | emit clientRemoved(c); | ||
709 | 703 | | |||
710 | updateStackingOrder(true); | 704 | updateStackingOrder(true); | ||
711 | 705 | | |||
712 | #ifdef KWIN_BUILD_TABBOX | 706 | #ifdef KWIN_BUILD_TABBOX | ||
707 | TabBox::TabBox *tabBox = TabBox::TabBox::self(); | ||||
713 | if (tabBox->isDisplayed()) | 708 | if (tabBox->isDisplayed()) | ||
714 | tabBox->reset(true); | 709 | tabBox->reset(true); | ||
715 | #endif | 710 | #endif | ||
716 | 711 | | |||
717 | updateClientArea(); | 712 | updateClientArea(); | ||
718 | } | 713 | } | ||
719 | 714 | | |||
720 | void Workspace::removeUnmanaged(Unmanaged* c) | 715 | void Workspace::removeUnmanaged(Unmanaged* c) | ||
▲ Show 20 Lines • Show All 1059 Lines • Show Last 20 Lines |