yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: Fixed initial desktops

Browse source
This commit is contained in:
Yuki Joou 2024-09-12 00:30:08 +02:00
parent afce075057
commit ebf8bb3535
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/x11window.cpp
View file

@ -744,7 +744,7 @@ bool X11Window::manage(xcb_window_t w, bool isMapped)
if (on_all) { if (on_all) {
initialDesktops = QList<VirtualDesktop *>{}; initialDesktops = QList<VirtualDesktop *>{};
} else if (on_current) { } else if (on_current) {
initialDesktops = QList<VirtualDesktop *>{VirtualDesktopManager::self()->currentDesktop()}; initialDesktops = QList<VirtualDesktop *>{VirtualDesktopManager::self()->currentDesktop(workspace()->activeOutput())};
} else if (maincl) { } else if (maincl) {
initialDesktops = maincl->desktops(); initialDesktops = maincl->desktops();
} }
@ -791,7 +791,7 @@ bool X11Window::manage(xcb_window_t w, bool isMapped)
if (isDesktop()) { if (isDesktop()) {
initialDesktops = QList<VirtualDesktop *>{}; initialDesktops = QList<VirtualDesktop *>{};
} else { } else {
initialDesktops = QList<VirtualDesktop *>{VirtualDesktopManager::self()->currentDesktop()}; initialDesktops = QList<VirtualDesktop *>{VirtualDesktopManager::self()->currentDesktop(workspace()->activeOutput())};
} }
} }
setDesktops(rules()->checkDesktops(*initialDesktops, !isMapped)); setDesktops(rules()->checkDesktops(*initialDesktops, !isMapped));

2
src/xdgshellwindow.cpp
View file

@ -419,7 +419,7 @@ XdgToplevelWindow::XdgToplevelWindow(XdgToplevelInterface *shellSurface)
{ {
setOutput(workspace()->activeOutput()); setOutput(workspace()->activeOutput());
setMoveResizeOutput(workspace()->activeOutput()); setMoveResizeOutput(workspace()->activeOutput());
setDesktops({VirtualDesktopManager::self()->currentDesktop()}); setDesktops({VirtualDesktopManager::self()->currentDesktop(workspace()->activeOutput())});
#if KWIN_BUILD_ACTIVITIES #if KWIN_BUILD_ACTIVITIES
if (auto a = Workspace::self()->activities()) { if (auto a = Workspace::self()->activities()) {
setOnActivities({a->current()}); setOnActivities({a->current()});