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

placementtracker: fix some windows not being restored

Browse source 
If a window was moved by the user, it got effectively blacklisted from being
ever restored again. Instead of only tracking the last restore point, compare the
current window state with the state it had when the output configuration was last
seen. If either that or the last restore point match the window, restore the old
window state.
This commit is contained in:
Xaver Hugl 2022-10-28 17:43:45 +02:00 committed by Vlad Zahorodnii
parent 84635c71ec
commit 264ecf40f8
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/placementtracker.cpp
View file

@ -46,7 +46,6 @@ void PlacementTracker::add(Window *window)
connect(window, &Window::clientFinishUserMovedResized, this, &PlacementTracker::saveInteractionCounter);
WindowData data = dataForWindow(window);
m_data[m_currentKey][window] = data;
m_lastRestoreData[window] = data;
m_savedWindows.push_back(window);
}
@ -61,7 +60,6 @@ void PlacementTracker::remove(Window *window)
for (auto &dataMap : m_data) {
dataMap.remove(window);
}
m_lastRestoreData.remove(window);
m_savedWindows.removeOne(window);
}
}
@ -77,26 +75,35 @@ void PlacementTracker::restore(const QString &key)
inhibit();
for (const auto window : std::as_const(m_savedWindows)) {
bool restore = true;
if (auto lastRestoreData = m_lastRestoreData.constFind(window); lastRestoreData != m_lastRestoreData.constEnd()) {
const auto it = dataMap.find(window);
if (it != dataMap.end()) {
const WindowData &newData = it.value();
// don't touch windows where the user intentionally changed their state
restore = window->interactiveMoveResizeCount() == lastRestoreData->interactiveMoveResizeCount
&& window->requestedMaximizeMode() == lastRestoreData->maximize
&& window->quickTileMode() == lastRestoreData->quickTile
&& window->isFullScreen() == lastRestoreData->fullscreen;
bool restore = window->interactiveMoveResizeCount() == newData.interactiveMoveResizeCount
&& window->requestedMaximizeMode() == newData.maximize
&& window->quickTileMode() == newData.quickTile
&& window->isFullScreen() == newData.fullscreen;
if (!restore) {
// the logic above can have false negatives if PlacementTracker changed the window state
// to prevent that, also restore if the window still has the same state from that
if (const auto it = m_lastRestoreData.find(window); it != m_lastRestoreData.end()) {
restore = window->interactiveMoveResizeCount() == it->interactiveMoveResizeCount
&& window->requestedMaximizeMode() == it->maximize
&& window->quickTileMode() == it->quickTile
&& window->isFullScreen() == it->fullscreen
&& window->moveResizeOutput()->uuid() == it->outputUuid;
}
}
if (!restore) {
// restore anyways if the output the window was on got removed
if (const auto oldData = oldDataMap.find(window); oldData != oldDataMap.end()) {
restore |= std::none_of(outputs.begin(), outputs.end(), [&oldData](const auto output) {
restore = std::none_of(outputs.begin(), outputs.end(), [&oldData](const auto output) {
return output->uuid() == oldData->outputUuid;
});
}
}
}
if (restore) {
const auto it = dataMap.find(window);
if (it != dataMap.end()) {
const WindowData &newData = it.value();
window->setFullScreen(false);
window->setQuickTileMode(QuickTileFlag::None, true);
window->setMaximize(false, false);
@ -120,11 +127,9 @@ void PlacementTracker::restore(const QString &key)
} else {
window->moveResize(newData.geometry);
}
}
// if the window got restored or would've been restored if data was available,
// make sure the current state counts as being not touched by the user
m_lastRestoreData[window] = dataForWindow(window);
}
}
// ensure data in current map is always up to date
dataMap[window] = dataForWindow(window);
}