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
92f03c42
Commit
92f03c42
authored
Mar 24, 2020
by
Jean-Baptiste Mardelle
Browse files
Relax snapping on zoom level > 16
parent
d6bfed0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/timeline.qml
View file @
92f03c42
...
...
@@ -267,7 +267,7 @@ Rectangle {
property
int
spacerFrame
:
-
1
property
int
spacerClickFrame
:
-
1
property
real
timeScale
:
timeline
.
scaleFactor
property
real
snapping
:
(
timeline
.
snap
&&
(
timeScale
<
2
*
baseUnit
))
?
baseUnit
/
(
timeScale
>
1
?
Math
.
sqrt
(
timeScale
)
:
timeScale
)
:
-
1
property
int
snapping
:
(
timeline
.
snap
&&
(
timeScale
<
2
*
baseUnit
))
?
Math
.
floor
(
baseUnit
/
(
timeScale
>
3
?
timeScale
/
2
:
timeScale
)
)
:
-
1
property
var
timelineSelection
:
timeline
.
selection
property
int
trackHeight
property
int
copiedClip
:
-
1
...
...
@@ -299,7 +299,7 @@ Rectangle {
// update dragged item pos
dragProxy
.
masterObject
.
updateDrag
()
}
console
.
log
(
'
GOT SCALE:
'
,
timeScale
,
'
- SNAPPING:
'
,
snapping
)
console
.
log
(
'
GOT SCALE:
'
,
timeScale
,
'
, BASE:
'
,
baseUnit
,
'
- SNAPPING:
'
,
snapping
)
}
onConsumerPositionChanged
:
{
...
...
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