ctrl_toggle preference, dblclk select single group/edit, update shortcuts

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / awindowgui.C

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 13e94b9570c4bff7cd57f09478278fe2d199acd7..a5e4007c20a66b787e0adb9364876b42c1c7dc30 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -357,7 +357,7 @@ int AssetViewPopup::button_press_event()
        MWindow *mwindow = picon->mwindow;
        EDL *edl = mwindow->edl;
        dragging = 0;
-       if( y < bar_h ) {
+       if( y < get_h()/2 ) {
                Indexable *idxbl =
                        picon->indexable ? picon->indexable :
                        picon->edl ? picon->edl : 0;
@@ -402,7 +402,7 @@ int AssetViewPopup::button_press_event()
                vwindow->update_position(CHANGE_NONE, 0, 1, 0);
                return 1;
        }
-       if( y >= get_h()-bar_h ) {
+       else {
                dragging = 1;
                if( !ctrl_down() && !shift_down() )
                        return cursor_motion_event();
@@ -454,7 +454,9 @@ int AssetViewPopup::cursor_motion_event()
 {
        if( !is_event_win() ) return 0;
        AssetVIconThread *avt = (AssetVIconThread *)vt;
-       if( !avt->vicon || draw_mode != ASSET_VIEW_MEDIA_MAP ) return 0;
+       if( !avt->vicon ||
+           ( draw_mode != ASSET_VIEW_FULL &&
+             draw_mode != ASSET_VIEW_MEDIA_MAP ) ) return 0;
        if( !get_button_down() || get_buttonpress() != LEFT_BUTTON ||
            ctrl_down() || alt_down() || shift_down() )
                return 0;
@@ -512,6 +514,7 @@ void AssetViewPopup::draw_vframe(VFrame *vframe)
        double total_length = edl->tracks->total_length();
        if( !total_length ) total_length = 1;
        for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+               if( !track->record ) continue;
                for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
                        Indexable *indexable = (Indexable *)edit->asset;
                        if( !indexable ) indexable = (Indexable *)edit->nested_edl;