Skip to content
GitLab
Menu
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
79eade13
Commit
79eade13
authored
Apr 03, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix fullscreen monitor selection doesn't work on Windows
Related to
#1390
parent
ea7791f5
Pipeline
#158707
passed with stage
in 12 minutes and 51 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/dialogs/kdenlivesettingsdialog.cpp
View file @
79eade13
...
...
@@ -743,8 +743,16 @@ void KdenliveSettingsDialog::initDevices()
QSignalBlocker
bk
(
m_configSdl
.
fullscreen_monitor
);
m_configSdl
.
fullscreen_monitor
->
clear
();
m_configSdl
.
fullscreen_monitor
->
addItem
(
i18n
(
"auto"
));
int
ix
=
0
;
for
(
const
QScreen
*
screen
:
qApp
->
screens
())
{
#ifdef Q_OS_WIN
// Screen manufacturer, model and serial don't work under Windows
m_configSdl
.
fullscreen_monitor
->
addItem
(
QString
(
"%1: %2"
).
arg
(
QString
::
number
(
ix
),
screen
->
name
()),
QString
::
number
(
ix
));
ix
++
;
#else
m_configSdl
.
fullscreen_monitor
->
addItem
(
QString
(
"%1 %2 (%3)"
).
arg
(
screen
->
manufacturer
(),
screen
->
model
(),
screen
->
name
()),
screen
->
serialNumber
());
#endif
}
if
(
!
KdenliveSettings
::
fullscreen_monitor
().
isEmpty
())
{
int
ix
=
m_configSdl
.
fullscreen_monitor
->
findData
(
KdenliveSettings
::
fullscreen_monitor
());
...
...
src/monitor/monitor.cpp
View file @
79eade13
...
...
@@ -989,9 +989,15 @@ 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
)
{
bool
screenFound
=
false
;
int
ix
=
-
1
;
if
(
!
KdenliveSettings
::
fullscreen_monitor
().
isEmpty
())
{
for
(
const
QScreen
*
screen
:
qApp
->
screens
())
{
#ifdef Q_OS_WIN
ix
++
;
if
(
QString
::
number
(
ix
)
==
KdenliveSettings
::
fullscreen_monitor
())
{
#else
if
(
screen
->
serialNumber
()
==
KdenliveSettings
::
fullscreen_monitor
())
{
#endif
// Match
m_glWidget
->
setParent
(
nullptr
);
m_glWidget
->
move
(
screen
->
geometry
().
topLeft
());
...
...
Write
Preview
Supports
Markdown
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