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
03479a84
Commit
03479a84
authored
Jan 17, 2020
by
Jean-Baptiste Mardelle
Browse files
Don't hardcode project display ratio for timeline thumbs
parent
6b8820e9
Pipeline
#13362
passed with stage
in 13 minutes and 43 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/ClipThumbs.qml
View file @
03479a84
...
...
@@ -9,7 +9,7 @@ Row {
anchors.fill
:
parent
visible
:
!
isAudio
opacity
:
clipStatus
==
ClipState
.
Disabled
?
0.2
:
1
property
int
thumbWidth
:
container
.
height
*
16.0
/
9.0
property
int
thumbWidth
:
container
.
height
*
root
.
dar
property
bool
enableCache
:
clipRoot
.
itemType
==
ProducerType
.
Video
||
clipRoot
.
itemType
==
ProducerType
.
AV
function
reload
()
{
...
...
src/timeline2/view/qml/timeline.qml
View file @
03479a84
...
...
@@ -257,6 +257,7 @@ Rectangle {
property
bool
seekingFinished
:
proxy
.
seekFinished
property
int
scrollMin
:
scrollView
.
flickableItem
.
contentX
/
timeline
.
scaleFactor
property
int
scrollMax
:
scrollMin
+
scrollView
.
viewport
.
width
/
timeline
.
scaleFactor
property
double
dar
:
16
/
9
onSeekingFinishedChanged
:
{
playhead
.
opacity
=
seekingFinished
?
1
:
0.5
...
...
src/timeline2/view/timelinewidget.cpp
View file @
03479a84
...
...
@@ -139,6 +139,7 @@ void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, M
connect
(
rootObject
(),
SIGNAL
(
zoomOut
(
bool
)),
pCore
->
window
(),
SLOT
(
slotZoomOut
(
bool
)));
connect
(
rootObject
(),
SIGNAL
(
processingDrag
(
bool
)),
pCore
->
window
(),
SIGNAL
(
enableUndo
(
bool
)));
connect
(
m_proxy
,
&
TimelineController
::
seeked
,
proxy
,
&
MonitorProxy
::
setPosition
);
rootObject
()
->
setProperty
(
"dar"
,
pCore
->
getCurrentDar
());
m_proxy
->
setRoot
(
rootObject
());
setVisible
(
true
);
loading
=
false
;
...
...
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