undo fixes, viewer change_source rework, cleanup

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

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index a94e176750392f3efdf8b29849b546095eaa4536..5ff595eeaec5801f23c60b0bb5006cbb486f3489 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -354,6 +354,19 @@ int VWindowGUI::keypress_event()
 
 int VWindowGUI::button_press_event()
 {
+       if( get_buttonpress() == LEFT_BUTTON && canvas->get_canvas() &&
+           canvas->get_canvas()->get_cursor_over_window() ) {
+               PlaybackEngine *playback_engine = vwindow->playback_engine;
+               unlock_window();
+               if( playback_engine->is_playing_back ) {
+                       transport->handle_transport(STOP, 1);
+               }
+               else {
+                       transport->handle_transport(NORMAL_FWD, 1);
+               }
+               vwindow->gui->lock_window("VWindowEditing::prev_label");
+               return 1;
+       }
        if(canvas->get_canvas())
                return canvas->button_press_event_base(canvas->get_canvas());
        return 0;
@@ -411,6 +424,7 @@ int VWindowGUI::drag_stop()
        {
                highlighted = 0;
                canvas->draw_refresh();
+               unlock_window();
 
                Indexable *indexable = mwindow->session->drag_assets->size() ?
                        mwindow->session->drag_assets->get(0) :
@@ -418,12 +432,12 @@ int VWindowGUI::drag_stop()
                EDL *edl = mwindow->session->drag_clips->size() ?
                        mwindow->session->drag_clips->get(0) :
                        0;
-
                if(indexable)
                        vwindow->change_source(indexable);
                else
                if(edl)
                        vwindow->change_source(edl);
+               lock_window("VWindowGUI::drag_stop");
                return 1;
        }