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
343721d2
Commit
343721d2
authored
Nov 12, 2021
by
Jean-Baptiste Mardelle
Browse files
Merge branch '2112'
parents
cc809b50
c89ff3ef
Pipeline
#96906
passed with stage
in 9 minutes and 9 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/timelinemodel.cpp
View file @
343721d2
...
...
@@ -198,7 +198,7 @@ QList<int> TimelineModel::getTracksIds(bool audio) const
auto
it
=
m_allTracks
.
cbegin
();
while
(
it
!=
m_allTracks
.
cend
())
{
if
((
*
it
)
->
isAudioTrack
()
==
audio
)
{
trackIds
.
insert
(
-
1
,
(
*
it
)
->
getId
());
trackIds
.
insert
(
0
,
(
*
it
)
->
getId
());
}
++
it
;
}
...
...
src/widgets/progressbutton.cpp
View file @
343721d2
...
...
@@ -22,7 +22,7 @@ ProgressButton::ProgressButton(const QString &text, double max, QWidget *parent)
m_progressFont
=
font
();
m_progressFont
.
setPixelSize
(
m_iconSize
/
2
);
initStyleOption
(
&
m_buttonStyle
);
QPixmap
pix
(
1
,
1
);
QPixmap
pix
(
m_iconSize
,
m_iconSize
);
pix
.
fill
(
Qt
::
transparent
);
m_dummyAction
=
new
QAction
(
QIcon
(
pix
),
text
,
this
);
}
...
...
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