Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
abf6f895
Commit
abf6f895
authored
Feb 07, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix monitor fullscreen in some cases and don't lose focus (broke shortcuts)
parent
6007d573
Pipeline
#14624
passed with stage
in 19 minutes and 32 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/monitor/monitor.cpp
View file @
abf6f895
...
...
@@ -811,10 +811,11 @@ void Monitor::slotSwitchFullScreen(bool minimizeOnly)
// Move monitor widget to the second screen (one screen for Kdenlive, the other one for the Monitor widget)
if
(
qApp
->
screens
().
count
()
>
1
)
{
for
(
auto
screen
:
qApp
->
screens
())
{
if
(
screen
!=
qApp
->
screenAt
(
pCore
->
window
()
->
geometry
().
center
()))
{
QRect
rect
=
screen
->
availableGeometry
();
QRect
screenRect
=
screen
->
availableGeometry
();
if
(
!
screenRect
.
contains
(
pCore
->
window
()
->
geometry
().
center
()))
{
m_glWidget
->
setParent
(
nullptr
);
m_glWidget
->
move
(
this
->
parentWidget
()
->
mapFromGlobal
(
rect
.
center
()));
m_glWidget
->
move
(
this
->
parentWidget
()
->
mapFromGlobal
(
screenRect
.
center
()));
m_glWidget
->
setGeometry
(
screenRect
);
break
;
}
}
...
...
@@ -822,6 +823,7 @@ void Monitor::slotSwitchFullScreen(bool minimizeOnly)
m_glWidget
->
setParent
(
nullptr
);
}
m_glWidget
->
showFullScreen
();
qApp
->
activeWindow
()
->
setFocus
();
}
else
{
m_glWidget
->
showNormal
();
auto
*
lay
=
(
QVBoxLayout
*
)
layout
();
...
...
Eugen Mohr
@emohr
mentioned in issue
#598 (closed)
·
Mar 26, 2020
mentioned in issue
#598 (closed)
mentioned in issue #598
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment