Commit 3a5964ca authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix shortcuts sometimes broken on fullscreen monitor.

Related to #1287
parent f59033da
......@@ -3980,10 +3980,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)
......
......@@ -2963,19 +2963,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();
......
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