Commit 8e68b656 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix shortcuts sometimes broken on fullscreen monitor.

Related to #1287
parent 97c9d076
Pipeline #116893 passed with stage
in 5 minutes and 2 seconds
......@@ -4016,10 +4016,12 @@ void MainWindow::triggerKey(QKeyEvent *ev)
// Trigger action
tempAction->trigger();
ev->accept();
activateWindow();
return;
}
}
}
QWidget::keyPressEvent(ev);
}
QDockWidget *MainWindow::addDock(const QString &title, const QString &objectName, QWidget *widget, Qt::DockWidgetArea area, const QKeySequence &shortcut)
......
......@@ -2962,19 +2962,13 @@ int TimelineController::insertZone(const QString &binId, QPoint zone, bool overw
int newPos = insertPoint + (sourceZone.y() - sourceZone.x());
int currentPos = pCore->getTimelinePosition();
Fun redoPos = [this, newPos]() {
Kdenlive::MonitorId activeMonitor = pCore->monitorManager()->activeMonitor()->id();
pCore->monitorManager()->activateMonitor(Kdenlive::ProjectMonitor);
pCore->monitorManager()->refreshProjectMonitor();
setPosition(newPos);
pCore->monitorManager()->activateMonitor(activeMonitor);
pCore->getMonitor(Kdenlive::ProjectMonitor)->refreshMonitorIfActive();
return true;
};
Fun undoPos = [this, currentPos]() {
Kdenlive::MonitorId activeMonitor = pCore->monitorManager()->activeMonitor()->id();
pCore->monitorManager()->activateMonitor(Kdenlive::ProjectMonitor);
pCore->monitorManager()->refreshProjectMonitor();
setPosition(currentPos);
pCore->monitorManager()->activateMonitor(activeMonitor);
pCore->getMonitor(Kdenlive::ProjectMonitor)->refreshMonitorIfActive();
return true;
};
redoPos();
......
  • Thank you for improving this situation! I still can get a unresponsive application by using full screen shortcut a few times. I sometimes fullscreen to make some edit, or have a closer view of the scene, but doing this a few times rapidly still leaves the focus somewhere else than kdenlive. I was hoping this commit could finally fix this definitively but it doesn't.

Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment