X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftimebar.C;h=68f42b5a13eaf47fb5f71b0f04111b458b0f0768;hp=222c6effdee124318938f5fe8a4a678a4d82c5a0;hb=ddfda6a8cc59bda4dc734973c1c5fecaa31ea487;hpb=87a3d09b0344fd6b60851161cbf250111301a63f diff --git a/cinelerra-5.1/cinelerra/timebar.C b/cinelerra-5.1/cinelerra/timebar.C index 222c6eff..68f42b5a 100644 --- a/cinelerra-5.1/cinelerra/timebar.C +++ b/cinelerra-5.1/cinelerra/timebar.C @@ -746,7 +746,8 @@ int TimeBar::button_press_event() stop_playback(); // Select region between two labels - if( !is_vwindow() && get_double_click() ) { + if( !is_vwindow() && get_double_click() && + get_edl()->labels->first ) { int x = get_relative_cursor_x(); double position = pixel_to_position(x); // Test labels @@ -848,21 +849,21 @@ int TimeBar::button_release_event() //printf("TimeBar::button_release_event %d %d\n", __LINE__, current_operation); int result = 0; int need_redraw = 0; - switch( current_operation ) - { - case TIMEBAR_DRAG: - mwindow->gui->get_focused_pane()->canvas->stop_dragscroll(); + switch( current_operation ) { + case TIMEBAR_DRAG: { + mwindow->gui->get_focused_pane()->canvas->stop_dragscroll(); + current_operation = TIMEBAR_NONE; + need_redraw = 1; + CWindowCanvas *canvas = mwindow->cwindow->gui->canvas; + canvas->draw_scope(canvas->refresh_frame, -1); + result = 1; + break; } + default: + if( current_operation != TIMEBAR_NONE ) { current_operation = TIMEBAR_NONE; - need_redraw = 1; result = 1; - break; - - default: - if( current_operation != TIMEBAR_NONE ) { - current_operation = TIMEBAR_NONE; - result = 1; - } - break; + } + break; } if( (!cursor_above() && highlighted) || need_redraw ) { @@ -920,14 +921,14 @@ int TimeBar::select_region(double position) // Que the CWindow unlock_window(); mwindow->cwindow->update(1, 0, 0); - mwindow->gui->lock_window("TimeBar::select_region"); + mwindow->gui->lock_window("TimeBar::select_region 3"); mwindow->gui->hide_cursor(0); mwindow->gui->draw_cursor(1); mwindow->gui->flash_canvas(0); mwindow->gui->activate_timeline(); mwindow->gui->zoombar->update(); mwindow->gui->unlock_window(); - lock_window("TimeBar::select_region"); + lock_window("TimeBar::select_region 4"); update_highlights(); return 0; }