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
f3da5ce4
Commit
f3da5ce4
authored
Mar 28, 2020
by
Jean-Baptiste Mardelle
Browse files
Shift when using spacer tool disables snapping
parent
12081a35
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/projectsortproxymodel.cpp
View file @
f3da5ce4
...
...
@@ -73,7 +73,7 @@ bool ProjectSortProxyModel::filterAcceptsRowItself(int sourceRow, const QModelIn
}
}
}
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
QModelIndex
index0
=
sourceModel
()
->
index
(
sourceRow
,
i
,
sourceParent
);
if
(
!
index0
.
isValid
())
{
...
...
@@ -84,7 +84,6 @@ bool ProjectSortProxyModel::filterAcceptsRowItself(int sourceRow, const QModelIn
return
true
;
}
}
return
false
;
}
...
...
src/timeline2/view/qml/timeline.qml
View file @
f3da5ce4
...
...
@@ -892,7 +892,7 @@ Rectangle {
// Move group
var
track
=
controller
.
getItemTrackId
(
spacerGroup
)
var
frame
=
Math
.
round
((
mouse
.
x
+
scrollView
.
contentX
)
/
timeline
.
scaleFactor
)
+
spacerFrame
-
spacerClickFrame
frame
=
controller
.
suggestItemMove
(
spacerGroup
,
track
,
frame
,
root
.
consumerPosition
,
root
.
snapping
)
frame
=
controller
.
suggestItemMove
(
spacerGroup
,
track
,
frame
,
root
.
consumerPosition
,
(
mouse
.
modifiers
&
Qt
.
ShiftModifier
)
?
0
:
root
.
snapping
)
continuousScrolling
(
mouse
.
x
+
scrollView
.
contentX
,
mouse
.
y
+
scrollView
.
contentY
)
}
scim
=
true
...
...
Bruno Santos
@bsantos
mentioned in issue
#599 (closed)
·
Mar 28, 2020
mentioned in issue
#599 (closed)
mentioned in issue #599
Toggle commit list
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