projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade x265 base as provided by Andrew
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
strack.C
diff --git
a/cinelerra-5.1/cinelerra/strack.C
b/cinelerra-5.1/cinelerra/strack.C
index ffa6a5b1e1f5c29f80b3b8986ea9062ce9cd1267..bdd4f59a469c47b2244735b9a46fcccf8d1daf35 100644
(file)
--- a/
cinelerra-5.1/cinelerra/strack.C
+++ b/
cinelerra-5.1/cinelerra/strack.C
@@
-18,6
+18,7
@@
STrack::STrack(EDL *edl, Tracks *tracks)
: Track(edl, tracks)
{
data_type = TRACK_SUBTITLE;
: Track(edl, tracks)
{
data_type = TRACK_SUBTITLE;
+ data_h = edl->local_session->zoom_atrack;
}
STrack::~STrack()
}
STrack::~STrack()
@@
-65,8
+66,10
@@
void STrack::create_objects()
int STrack::vertical_span(Theme *theme)
{
int track_h = Track::vertical_span(theme);
int STrack::vertical_span(Theme *theme)
{
int track_h = Track::vertical_span(theme);
- int patch_h = 0;
- return track_h + patch_h;
+ int patch_h = theme->title_h;
+ if( expand_view )
+ patch_h += theme->play_h;
+ return MAX(track_h, patch_h);
}
}