Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Fix keyboard handling in monitor fullscreen mode, thanks to Martin K.

BUG: 413644
parent a037d8c7
......@@ -171,7 +171,7 @@ Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *paren
connect(m_qmlManager, &QmlManager::effectPointsChanged, this, &Monitor::effectPointsChanged);
auto *monitorEventEater = new QuickMonitorEventEater(this);
m_glWidget->installEventFilter(monitorEventEater);
m_videoWidget->installEventFilter(monitorEventEater);
connect(monitorEventEater, &QuickMonitorEventEater::doKeyPressEvent, this, &Monitor::doKeyPressEvent);
glayout->addWidget(m_videoWidget, 0, 0);
......@@ -778,6 +778,7 @@ void Monitor::setZoom()
void Monitor::slotSwitchFullScreen(bool minimizeOnly)
{
// TODO: disable screensaver?
pause();
if (!m_videoWidget->isFullScreen() && !minimizeOnly) {
// Move monitor widget to the second screen (one screen for Kdenlive, the other one for the Monitor widget)
if (qApp->screens().count() > 1) {
......@@ -804,15 +805,6 @@ void Monitor::slotSwitchFullScreen(bool minimizeOnly)
}
}
void Monitor::reparent()
{
m_glWidget->setParent(nullptr);
m_glWidget->showMinimized();
m_glWidget->showNormal();
auto *lay = (QVBoxLayout *)layout();
lay->insertWidget(0, m_glWidget, 10);
}
// virtual
void Monitor::mouseReleaseEvent(QMouseEvent *event)
{
......@@ -963,7 +955,7 @@ void Monitor::keyPressEvent(QKeyEvent *event)
event->accept();
return;
}
if (m_glWidget->isFullScreen()) {
if (m_videoWidget->isFullScreen()) {
event->ignore();
emit passKeyPress(event);
return;
......
......@@ -128,7 +128,6 @@ public:
void switchDropFrames(bool drop);
void updateMonitorGamma();
void mute(bool, bool updateIconOnly = false) override;
void reparent();
/** @brief Returns the action displaying record toolbar */
QAction *recAction();
void refreshIcons();
......
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