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
4f2ee42e
Commit
4f2ee42e
authored
Nov 28, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure selected subtitle always appears on top
parent
54b43cb5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
42 deletions
+8
-42
src/timeline2/view/qml/SubTitle.qml
src/timeline2/view/qml/SubTitle.qml
+2
-2
src/timeline2/view/qml/timeline.qml
src/timeline2/view/qml/timeline.qml
+6
-40
No files found.
src/timeline2/view/qml/SubTitle.qml
View file @
4f2ee42e
...
...
@@ -4,14 +4,14 @@ import QtQuick.Controls 2.4
Item
{
id
:
subtitleRoot
visible
:
true
z
:
20
z
:
selected
?
30
:
20
property
int
oldStartX
property
int
startFrame
property
int
endFrame
property
int
subId
property
int
duration
:
endFrame
-
startFrame
property
double
tScale
:
root
.
timeScale
property
var
subtitle
property
string
subtitle
property
bool
selected
height
:
subtitleTrack
.
height
onStartFrameChanged
:
{
...
...
src/timeline2/view/qml/timeline.qml
View file @
4f2ee42e
...
...
@@ -1574,47 +1574,13 @@ Rectangle {
DelegateModel
{
id
:
subtitleDelegateModel
model
:
subtitleModel
delegate
:
Item
{
Loader
{
id
:
loader
Binding
{
target
:
loader
.
item
property
:
"
selected
"
value
:
model
.
selected
when
:
loader
.
status
==
Loader
.
Ready
&&
loader
.
item
}
Binding
{
target
:
loader
.
item
property
:
"
startFrame
"
value
:
model
.
startframe
when
:
loader
.
status
==
Loader
.
Ready
&&
loader
.
item
}
Binding
{
target
:
loader
.
item
property
:
"
endFrame
"
value
:
model
.
endframe
when
:
loader
.
status
==
Loader
.
Ready
&&
loader
.
item
}
Binding
{
target
:
loader
.
item
property
:
"
subtitle
"
value
:
model
.
subtitle
when
:
loader
.
status
==
Loader
.
Ready
&&
loader
.
item
}
sourceComponent
:
{
return
subTitleDelegate
}
onLoaded
:
{
item
.
subId
=
model
.
id
}
}
delegate
:
SubTitle
{
subId
:
model
.
id
selected
:
model
.
selected
startFrame
:
model
.
startframe
endFrame
:
model
.
endframe
subtitle
:
model
.
subtitle
}
}
Component
{
id
:
subTitleDelegate
SubTitle
{}
}
Connections
{
...
...
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