Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
5d2b4cc5
Commit
5d2b4cc5
authored
Feb 07, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix monitor fullscreen in some cases and don't lose focus (broke shortcuts)
parent
d1908120
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+5
-3
No files found.
src/monitor/monitor.cpp
View file @
5d2b4cc5
...
...
@@ -776,10 +776,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
;
}
}
...
...
@@ -787,6 +788,7 @@ void Monitor::slotSwitchFullScreen(bool minimizeOnly)
m_glWidget
->
setParent
(
nullptr
);
}
m_glWidget
->
showFullScreen
();
qApp
->
activeWindow
()
->
setFocus
();
}
else
{
m_glWidget
->
showNormal
();
auto
*
lay
=
(
QVBoxLayout
*
)
layout
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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