Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
25c1628e
Commit
25c1628e
authored
Nov 24, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Center view when seeking to timeline clip.
Fixes
#844
parent
8fc74398
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
0 deletions
+16
-0
src/timeline2/view/qml/timeline.qml
src/timeline2/view/qml/timeline.qml
+4
-0
src/timeline2/view/timelinecontroller.cpp
src/timeline2/view/timelinecontroller.cpp
+1
-0
src/timeline2/view/timelinecontroller.h
src/timeline2/view/timelinecontroller.h
+3
-0
src/timeline2/view/timelinetabs.cpp
src/timeline2/view/timelinetabs.cpp
+1
-0
src/timeline2/view/timelinewidget.cpp
src/timeline2/view/timelinewidget.cpp
+5
-0
src/timeline2/view/timelinewidget.h
src/timeline2/view/timelinewidget.h
+2
-0
No files found.
src/timeline2/view/qml/timeline.qml
View file @
25c1628e
...
...
@@ -201,6 +201,10 @@ Rectangle {
}
return
col
}
function
centerViewOnCursor
()
{
scrollView
.
contentX
=
Math
.
max
(
0
,
root
.
consumerPosition
*
timeline
.
scaleFactor
-
(
scrollView
.
width
/
2
))
}
function
clearDropData
()
{
clipBeingDroppedId
=
-
1
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
25c1628e
...
...
@@ -1653,6 +1653,7 @@ void TimelineController::focusItem(int itemId)
{
int
start
=
m_model
->
getItemPosition
(
itemId
);
setPosition
(
start
);
emit
centerView
();
}
int
TimelineController
::
headerWidth
()
const
...
...
src/timeline2/view/timelinecontroller.h
View file @
25c1628e
...
...
@@ -697,6 +697,9 @@ signals:
/* @brief User enabled / disabled snapping, update timeline behavior
*/
void
snapChanged
();
/* @brief Center timeline view on current position
*/
void
centerView
();
Q_INVOKABLE
void
ungrabHack
();
};
...
...
src/timeline2/view/timelinetabs.cpp
View file @
25c1628e
...
...
@@ -87,6 +87,7 @@ void TimelineTabs::connectTimeline(TimelineWidget *timeline)
connect
(
timeline
->
controller
(),
&
TimelineController
::
updateZoom
,
this
,
[
&
](
double
value
)
{
emit
updateZoom
(
getCurrentTimeline
()
->
zoomForScale
(
value
));
});
connect
(
timeline
->
controller
(),
&
TimelineController
::
showItemEffectStack
,
this
,
&
TimelineTabs
::
showItemEffectStack
);
connect
(
timeline
->
controller
(),
&
TimelineController
::
showSubtitle
,
this
,
&
TimelineTabs
::
showSubtitle
);
connect
(
timeline
->
controller
(),
&
TimelineController
::
centerView
,
timeline
,
&
TimelineWidget
::
slotCenterView
);
}
void
TimelineTabs
::
disconnectTimeline
(
TimelineWidget
*
timeline
)
...
...
src/timeline2/view/timelinewidget.cpp
View file @
25c1628e
...
...
@@ -365,6 +365,11 @@ void TimelineWidget::slotChangeZoom(int value, bool zoomOnMouse)
m_proxy
->
setScaleFactorOnMouse
(
pixelScale
/
comboScale
[
value
],
zoomOnMouse
);
}
void
TimelineWidget
::
slotCenterView
()
{
QMetaObject
::
invokeMethod
(
rootObject
(),
"centerViewOnCursor"
);
}
void
TimelineWidget
::
slotFitZoom
()
{
QVariant
returnedValue
;
...
...
src/timeline2/view/timelinewidget.h
View file @
25c1628e
...
...
@@ -66,6 +66,8 @@ protected:
public
slots
:
void
slotChangeZoom
(
int
value
,
bool
zoomOnMouse
);
void
slotFitZoom
();
/* @brief Center timeline view on current timeline cursor position */
void
slotCenterView
();
void
zoneUpdated
(
const
QPoint
&
zone
);
void
zoneUpdatedWithUndo
(
const
QPoint
&
oldZone
,
const
QPoint
&
newZone
);
/* @brief Favorite effects have changed, reload model for context menu */
...
...
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