carl's patch for split/region-drag crash

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 39542b0e7015d8949984d59dddb146d5bbaed0eb..dd33f48a7e9daaf02a7fb9f263181b3afe12b65d 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -424,6 +424,8 @@ Editor::popup_ruler_menu (nframes64_t where, ItemType t)
        
        case CdMarkerBarItem:
                // TODO
+               ruler_items.push_back (MenuElem (_("Clear all locations"), mem_fun(*this, &Editor::clear_markers)));
+               ruler_items.push_back (MenuElem (_("Unhide locations"), mem_fun(*this, &Editor::unhide_markers)));
                ruler_items.push_back (MenuElem (_("New CD track marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where, true, false)));
                break;
                
@@ -818,7 +820,9 @@ Editor::update_ruler_visibility ()
                vertical_adjustment.set_value (full_canvas_height - canvas_height + 1);
        } else {
                _trackview_group->property_y () = - get_trackview_group_vertical_offset ();
+               _background_group->property_y () = - get_trackview_group_vertical_offset ();
                _trackview_group->move (0, 0);
+               _background_group->move (0, 0);
                last_trackview_group_vertical_offset = get_trackview_group_vertical_offset ();
        }