replace spash/about bg img, fix transition strip, include olaf de.po+neophyte, update...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / trackcanvas.C

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 700e10cd7bb1dbca088779c89b00c701f209c8e7..4de073e34a281231075b3e7c69a71f5aca5db171 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -1846,6 +1846,8 @@ void TrackCanvas::draw_transitions()
                        int strip_x = x, edit_y = y;
                        get_transition_coords(edit, x, y, w, h);
                        int strip_y = y - mwindow->theme->get_image("plugin_bg_data")->get_h();
+                       if( track->show_assets() && track->show_titles() )
+                               edit_y += mwindow->theme->get_image("title_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) *