Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLMC
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Craig Janeway
VLMC
Commits
34dab072
Commit
34dab072
authored
Aug 12, 2017
by
luyikei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Timeline: Fix clip placement in collision detection
parent
141beca3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
src/Gui/timeline/main.qml
src/Gui/timeline/main.qml
+1
-1
No files found.
src/Gui/timeline/main.qml
View file @
34dab072
...
...
@@ -106,7 +106,7 @@ Rectangle {
cEndPos
+=
clipMargin
;
if
(
cEndPos
>=
newPos
&&
newPos
+
target
.
length
-
1
>=
cPos
)
{
if
(
cPos
>=
newPos
)
{
if
(
cPos
-
target
.
length
+
1
>
0
)
if
(
cPos
-
target
.
length
+
clipMargin
>=
0
)
newPos
=
cPos
-
target
.
length
+
clipMargin
;
else
newPos
=
target
.
position
;
...
...
Write
Preview
Markdown
is supported
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