transition at beginning/end, shape xtion fixes

[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 e9511d2ded9d2ce2bd8db076495483394eb0a384..2a64845af735e32a78d69bbac13b4298c386ac5c 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -203,25 +203,24 @@ int TrackCanvas::drag_motion(Track **over_track,
                                {
                                        int64_t edit_x, edit_y, edit_w, edit_h;
                                        edit_dimensions(edit, edit_x, edit_y, edit_w, edit_h);
-
-                                       if( cursor_x >= edit_x && cursor_x < edit_x + edit_w &&
-                                           cursor_y >= edit_y && cursor_y < edit_y + edit_h ) {
+                                       if( cursor_y < edit_y || cursor_y >= edit_y + edit_h ) continue;
+                                       if( cursor_x >= edit_x && cursor_x < edit_x + edit_w ) {
                                                *over_edit = edit;
                                                break;
                                        }
                                        if( edit != track->edits->last ) continue;
-                                       if( edit->silence() ) continue;
                                        if( mwindow->session->current_operation != DRAG_ATRANSITION &&
                                            mwindow->session->current_operation != DRAG_VTRANSITION ) continue;
-                                       if( cursor_x >= edit_x + edit_w &&
-                                           cursor_y >= edit_y && cursor_y < edit_y + edit_h ) {
+                                       if( !edit->silence() ) {
                                                // add silence to allow drag transition past last edit
                                                //  will be deleted by Edits::optimize if not used
                                                double length = mwindow->edl->session->default_transition_length;
                                                int64_t start = edit->startproject+edit->length;
                                                int64_t units = track->to_units(length, 1); 
                                                track->edits->create_silence(start, start+units);
+                                               continue;
                                        }
+                                       if( cursor_x >= edit_x ) { *over_edit = edit; break; }
                                }
 
                                for(int i = 0; i < track->plugin_set.total; i++)