projects
/
goodguy
/
history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52c715c
)
repair transition strip_y limits
author
Good Guy
<good1.2guy@gmail.com>
Fri, 28 Sep 2018 01:50:21 +0000
(19:50 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Fri, 28 Sep 2018 01:50:21 +0000
(19:50 -0600)
cinelerra-5.1/cinelerra/trackcanvas.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/trackcanvas.C
b/cinelerra-5.1/cinelerra/trackcanvas.C
index ab558a5c705a8ed44cf705ad44fa6afc2fec3ca4..76b69aab3d2f1e59a5bc87fd04b853e04faea3f8 100644
(file)
--- a/
cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/
cinelerra-5.1/cinelerra/trackcanvas.C
@@
-1844,12
+1844,10
@@
void TrackCanvas::draw_transitions()
for(Edit *edit = track->edits->first; edit; edit = edit->next) {
if(!edit->transition) continue;
edit_dimensions(edit, x, y, w, h);
for(Edit *edit = track->edits->first; edit; edit = edit->next) {
if(!edit->transition) continue;
edit_dimensions(edit, x, y, w, h);
- int strip_x = x;
+ int strip_x = x
, edit_y = y
;
get_transition_coords(edit, x, y, w, h);
get_transition_coords(edit, x, y, w, h);
- int strip_h = mwindow->theme->get_image("plugin_bg_data")->get_h();
- int track_y = edit->edits->track->y_pixel;
- int strip_y = y - strip_h;
- if( strip_y < track_y ) strip_y = track_y;
+ int strip_y = y - mwindow->theme->get_image("plugin_bg_data")->get_h();
+ if( strip_y < edit_y ) strip_y = edit_y;
int strip_w = Units::round(edit->track->from_units(edit->transition->length) *
mwindow->edl->session->sample_rate / mwindow->edl->local_session->zoom_sample);
int strip_w = Units::round(edit->track->from_units(edit->transition->length) *
mwindow->edl->session->sample_rate / mwindow->edl->local_session->zoom_sample);