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
6ed1f5f0
Commit
6ed1f5f0
authored
Jun 05, 2020
by
Jean-Baptiste Mardelle
Browse files
Correctly initialize timeline snapping
parent
d906769b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/timeline.qml
View file @
6ed1f5f0
...
...
@@ -285,7 +285,7 @@ Rectangle {
property
int
spacerFrame
:
-
1
property
int
spacerClickFrame
:
-
1
property
real
timeScale
:
timeline
.
scaleFactor
property
int
snapping
:
(
timeline
.
snap
&&
(
time
Scale
<
2
*
baseUnit
))
?
Math
.
floor
(
baseUnit
/
(
time
Scale
>
3
?
timeScale
/
2
:
timeScale
))
:
-
1
property
int
snapping
:
(
timeline
.
snap
&&
(
time
line
.
scaleFactor
<
2
*
baseUnit
))
?
Math
.
floor
(
baseUnit
/
(
time
line
.
scaleFactor
>
3
?
timeline
.
scaleFactor
/
2
:
timeline
.
scaleFactor
))
:
-
1
property
var
timelineSelection
:
timeline
.
selection
property
int
trackHeight
property
int
copiedClip
:
-
1
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
6ed1f5f0
...
...
@@ -2704,7 +2704,6 @@ void TimelineController::updateClipActions()
if
(
m_model
->
isClip
(
item
))
{
clip
=
m_model
->
getClipPtr
(
item
);
}
bool
enablePositionActions
=
positionIsInItem
(
item
);
for
(
QAction
*
act
:
clipActions
)
{
bool
enableAction
=
true
;
const
QChar
actionData
=
act
->
data
().
toChar
();
...
...
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