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

effects/desktopgrid: Make termination code less error prone

Browse source 
The desktop grid effect can be deactivated in postPaintScreen() without
delaying finish().
This commit is contained in:
Vlad Zahorodnii 2022-04-30 21:07:05 +03:00
parent e9d1def1ba
commit 2da599c670
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/effects/desktopgrid/desktopgrid.cpp
View file

@ -232,14 +232,6 @@ void DesktopGridEffect::prePaintScreen(ScreenPrePaintData &data, std::chrono::mi
lastPresentTime = presentTime;
if (timelineRunning) {
timeline.setCurrentTime(timeline.currentTime() + (timeline.direction() == QTimeLine::Forward ? time : -time));
if ((timeline.currentTime() <= 0 && timeline.direction() == QTimeLine::Backward)) {
timelineRunning = false;
// defer until the event loop to finish
QTimer::singleShot(0, [this]() {
finish();
});
}
}
for (int i = 0; i < effects->numberOfDesktops(); i++) {
auto item = hoverTimeline[i];
@ -340,21 +332,27 @@ void DesktopGridEffect::postPaintScreen()
{
bool resetLastPresentTime = true;
if (timelineRunning || activated ? timeline.currentValue() != 1 : timeline.currentValue() != 0) {
effects->addRepaintFull(); // Repaint during zoom
resetLastPresentTime = false;
}
if (isUsingPresentWindows() && isMotionManagerMovingWindows()) {
effects->addRepaintFull();
resetLastPresentTime = false;
}
if (activated) {
for (int i = 0; i < effects->numberOfDesktops(); i++) {
if (hoverTimeline[i]->currentValue() != 0.0 && hoverTimeline[i]->currentValue() != 1.0) {
// Repaint during soft highlighting
effects->addRepaintFull();
resetLastPresentTime = false;
break;
const bool finished = timelineRunning && (timeline.currentTime() <= 0 && timeline.direction() == QTimeLine::Backward);
if (finished) {
timelineRunning = false;
finish();
} else {
if (timelineRunning || activated ? timeline.currentValue() != 1 : timeline.currentValue() != 0) {
effects->addRepaintFull(); // Repaint during zoom
resetLastPresentTime = false;
}
if (isUsingPresentWindows() && isMotionManagerMovingWindows()) {
effects->addRepaintFull();
resetLastPresentTime = false;
}
if (activated) {
for (int i = 0; i < effects->numberOfDesktops(); i++) {
if (hoverTimeline[i]->currentValue() != 0.0 && hoverTimeline[i]->currentValue() != 1.0) {
// Repaint during soft highlighting
effects->addRepaintFull();
resetLastPresentTime = false;
break;
}
}
}
}