Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
1a79a838
Commit
1a79a838
authored
May 04, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubber selection moving with scolling.
Fixes
#657
parent
498434c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
5 deletions
+12
-5
src/timeline2/view/qml/timeline.qml
src/timeline2/view/qml/timeline.qml
+12
-5
No files found.
src/timeline2/view/qml/timeline.qml
View file @
1a79a838
...
...
@@ -1443,16 +1443,21 @@ Rectangle {
vertical
=
0
stop
()
}
else
{
var
maxScroll
=
trackHeaders
.
height
-
tracksArea
.
height
+
scrollView
.
ScrollBar
.
horizontal
.
height
+
ruler
.
height
if
(
scrollView
.
contentY
>
maxScroll
)
{
scrollView
.
contentY
=
Math
.
max
(
0
,
maxScroll
)
if
((
clipBeingMovedId
==
-
1
&&
!
rubberSelect
.
visible
))
{
vertical
=
0
stop
()
}
else
{
var
maxScroll
=
trackHeaders
.
height
-
tracksArea
.
height
+
scrollView
.
ScrollBar
.
horizontal
.
height
+
ruler
.
height
if
(
scrollView
.
contentY
>
maxScroll
)
{
scrollView
.
contentY
=
Math
.
max
(
0
,
maxScroll
)
vertical
=
0
stop
()
}
}
}
}
if
(
horizontal
!=
0
)
{
if
(
scrollView
.
contentX
+
horizontal
<
0
)
{
if
(
scrollView
.
contentX
<
-
horizontal
)
{
horizontal
=
-
scrollView
.
contentX
scrollView
.
contentX
=
0
}
else
{
...
...
@@ -1462,14 +1467,16 @@ Rectangle {
dragProxy
.
x
+=
horizontal
dragProxyArea
.
moveItem
()
}
if
(
scrollView
.
contentX
==
0
||
clipBeingMovedId
==
-
1
)
{
if
(
scrollView
.
contentX
==
0
||
(
clipBeingMovedId
==
-
1
&&
!
rubberSelect
.
visible
)
)
{
horizontal
=
0
stop
()
}
}
if
(
rubberSelect
.
visible
)
{
rubberSelect
.
x
-=
horizontal
rubberSelect
.
width
+=
horizontal
rubberSelect
.
y
-=
vertical
rubberSelect
.
height
+=
vertical
}
}
}
...
...
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