Changeset View
Changeset View
Standalone View
Standalone View
workspace.cpp
Show First 20 Lines • Show All 224 Lines • ▼ Show 20 Line(s) | 224 | connect(vds, &VirtualDesktopManager::desktopRemoved, this, | |||
---|---|---|---|---|---|
225 | [this](KWin::VirtualDesktop *desktop) { | 225 | [this](KWin::VirtualDesktop *desktop) { | ||
226 | //Wayland | 226 | //Wayland | ||
227 | if (kwinApp()->operationMode() == Application::OperationModeWaylandOnly || | 227 | if (kwinApp()->operationMode() == Application::OperationModeWaylandOnly || | ||
228 | kwinApp()->operationMode() == Application::OperationModeXwayland) { | 228 | kwinApp()->operationMode() == Application::OperationModeXwayland) { | ||
229 | for (auto it = m_allClients.constBegin(); it != m_allClients.constEnd(); ++it) { | 229 | for (auto it = m_allClients.constBegin(); it != m_allClients.constEnd(); ++it) { | ||
230 | const bool needsMove = (*it)->desktops().count() == 1; | 230 | const bool needsMove = (*it)->desktops().count() == 1; | ||
231 | (*it)->removeDesktop(desktop); | 231 | (*it)->removeDesktop(desktop); | ||
232 | if (needsMove) { | 232 | if (needsMove) { | ||
233 | const VirtualDesktop *otherDesktop = VirtualDesktopManager::self()->desktops().first(); | | |||
234 | sendClientToDesktop(*it, qMin(desktop->x11DesktopNumber(), VirtualDesktopManager::self()->count()), true); | 233 | sendClientToDesktop(*it, qMin(desktop->x11DesktopNumber(), VirtualDesktopManager::self()->count()), true); | ||
235 | } | 234 | } | ||
236 | } | 235 | } | ||
237 | //X11 | 236 | //X11 | ||
238 | } else { | 237 | } else { | ||
239 | for (auto it = m_allClients.constBegin(); it != m_allClients.constEnd(); ++it) { | 238 | for (auto it = m_allClients.constBegin(); it != m_allClients.constEnd(); ++it) { | ||
240 | if (!(*it)->isOnAllDesktops() && ((*it)->desktop() > static_cast<int>(VirtualDesktopManager::self()->count()))) { | 239 | if (!(*it)->isOnAllDesktops() && ((*it)->desktop() > static_cast<int>(VirtualDesktopManager::self()->count()))) { | ||
241 | sendClientToDesktop(*it, VirtualDesktopManager::self()->count(), true); | 240 | sendClientToDesktop(*it, VirtualDesktopManager::self()->count(), true); | ||
▲ Show 20 Lines • Show All 1533 Lines • Show Last 20 Lines |