X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=f2b7dd02df8309f963145c21bcd73bd11872e1ad;hp=b2510711fa2c4361a120e526a4473e8fc7f10d9a;hb=3ca89f6b4413ccd6bb471dc5d334534bfd58838a;hpb=8a2d79c16c6793d7d3483e9a74205569228ca0cc;ds=sidebyside diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C index b2510711..f2b7dd02 100644 --- a/cinelerra-5.1/cinelerra/trackcanvas.C +++ b/cinelerra-5.1/cinelerra/trackcanvas.C @@ -76,6 +76,7 @@ #include "theme.h" #include "trackcanvas.h" #include "tracking.h" +#include "trackpopup.h" #include "tracks.h" #include "transition.h" #include "transitionhandles.h" @@ -144,7 +145,7 @@ void TrackCanvas::create_objects() pankeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->pankeyframe_data, PIXMAP_ALPHA); projectorkeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->projectorkeyframe_data, PIXMAP_ALPHA); maskkeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->maskkeyframe_data, PIXMAP_ALPHA); - draw(); + draw(NORMAL_DRAW, 1); update_cursor(0); flash(0); } @@ -152,7 +153,7 @@ void TrackCanvas::create_objects() void TrackCanvas::resize_event() { //printf("TrackCanvas::resize_event 1\n"); - draw(0, 0); + draw(NORMAL_DRAW, 0); flash(0); //printf("TrackCanvas::resize_event 2\n"); } @@ -650,7 +651,6 @@ void TrackCanvas::draw(int mode, int hide_cursor) { const int debug = 0; - // Swap pixmap layers if(get_w() != background_pixmap->get_w() || get_h() != background_pixmap->get_h()) @@ -699,7 +699,7 @@ void TrackCanvas::draw_indexes(Indexable *indexable) // Don't redraw raw samples if(index_state->index_zoom > mwindow->edl->local_session->zoom_sample) return; - draw_resources(0, 1, indexable); + draw_resources(NORMAL_DRAW, 1, indexable); draw_overlays(); flash(0); } @@ -1193,11 +1193,12 @@ void TrackCanvas::draw_paste_destination() from_units(drop_edit_position(&insertion, mwindow->session->drag_edit, mwindow->session->drag_edit->length)); + current_vedit++; } } if( paste_position >= 0 ) { position = paste_position; - current_vedit++; + current_vtrack++; //draw_box = 1; } else @@ -1590,10 +1591,22 @@ void TrackCanvas::draw_highlighting() } - - if(draw_box) - { + if( draw_box ) draw_highlight_rectangle(x, y, w, h); + + for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) { + for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + if( !edit->is_selected ) continue; + edit_dimensions(edit, x, y, w, h); + if( !MWindowGUI::visible(x, x + w, 0, get_w()) ) continue; + if( !MWindowGUI::visible(y, y + h, 0, get_h()) ) continue; + set_color(GREEN | BLUE); + set_inverse(); + draw_rectangle(x, y, w, h); + set_color(RED); + draw_rectangle(x-1, y-1, w+2, h+2); + set_opaque(); + } } } @@ -4673,13 +4686,19 @@ int TrackCanvas::do_tracks(int cursor_x, int cursor_y, int button_press) int64_t track_x, track_y, track_w, track_h; track_dimensions(track, track_x, track_y, track_w, track_h); - if( button_press && get_buttonpress() == RIGHT_BUTTON && - cursor_y >= track_y && cursor_y < track_y + track_h) { + if( button_press && cursor_y >= track_y && cursor_y < track_y + track_h ) { double pos = mwindow->edl->get_cursor_position(cursor_x, pane->number); int64_t position = track->to_units(pos, 0); - gui->edit_menu->update(track, track->edits->editof(position, PLAY_FORWARD, 0)); - gui->edit_menu->activate_menu(); - result = 1; + if( get_buttonpress() == RIGHT_BUTTON ) { + gui->track_menu->update(track); + gui->track_menu->activate_menu(); + result = 1; + } + else if( get_buttonpress() == MIDDLE_BUTTON ) { + gui->edit_menu->update(track->edits->editof(position, PLAY_FORWARD, 0)); + gui->edit_menu->activate_menu(); + result = 1; + } } } @@ -4702,7 +4721,7 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag cursor_y >= edit_y && cursor_y < edit_y + edit_h) { // Select duration of edit if(button_press) { - if(get_double_click() && !drag_start) { + if( !drag_start && get_double_click() ) { mwindow->edl->local_session->set_selectionstart(edit->track->from_units(edit->startproject)); mwindow->edl->local_session->set_selectionend(edit->track->from_units(edit->startproject) + edit->track->from_units(edit->length)); @@ -4713,31 +4732,33 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag mwindow->edl->local_session->set_selectionend( mwindow->edl->align_to_frame(mwindow->edl->local_session->get_selectionend(1), 1)); } + result = 1; + } + if( ctrl_down() && get_buttonpress() == 1 && + mwindow->edl->session->editing_mode == EDITING_ARROW ) { + edit->is_selected = !edit->is_selected ? 1 : 0; + result = 1; + } + if( result ) { redraw = 1; rerender = 1; update_cursor = -1; - result = 1; } } - else if(drag_start && track->record) { - if(mwindow->edl->session->editing_mode == EDITING_ARROW) { + else if( drag_start && track->record ) { + if( mwindow->edl->session->editing_mode == EDITING_ARROW ) { // Need to create drag window mwindow->session->current_operation = DRAG_EDIT; mwindow->session->drag_edit = edit; -//printf("TrackCanvas::do_edits 2\n"); - -// Drag only one edit if ctrl is initially down - if(ctrl_down()) { - mwindow->session->drag_edits->remove_all(); - mwindow->session->drag_edits->append(edit); - } - else { // Construct list of all affected edits - mwindow->edl->tracks->get_affected_edits( - mwindow->session->drag_edits, + mwindow->edl->tracks->clear_selected_edits(); + if( ctrl_down() ) + edit->is_selected = 1; + else + mwindow->edl->tracks->select_affected_edits( edit->track->from_units(edit->startproject), edit->track); - } + mwindow->edl->tracks->get_selected_edits(mwindow->session->drag_edits); mwindow->session->drag_origin_x = cursor_x; mwindow->session->drag_origin_y = cursor_y; // Where the drag started, so we know relative position inside the edit later @@ -4997,7 +5018,7 @@ int TrackCanvas::button_press_event() update_cursor) ) break; if( do_edits(cursor_x, cursor_y, 1, 0, - update_cursor, rerender, new_cursor, + update_overlay, rerender, new_cursor, update_cursor) ) break; if( do_plugins(cursor_x, cursor_y, 0, 1,