Move control surface options into RC prefs editor. Remove Options menu.

[ardour.git] / gtk2_ardour / canvas-note-event.cc

diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc
index a81692d01e9d3c40cb513471ac88f3b39a0f4794..77ef7b263f5a12cbee0d544c7023482217977e81 100644 (file)
--- a/gtk2_ardour/canvas-note-event.cc
+++ b/gtk2_ardour/canvas-note-event.cc
@@ -74,8 +74,9 @@ CanvasNoteEvent::move_event(double dx, double dy)
 void
 CanvasNoteEvent::show_velocity()
 {
-       hide_velocity();
-       _text = new InteractiveText(*(_item->property_parent()), this);
+       if (!_text) {
+               _text = new InteractiveText(*(_item->property_parent()), this);
+       }
        _text->property_x() = (x1() + x2()) /2;
        _text->property_y() = (y1() + y2()) /2;
        ostringstream velo(ios::ate);
@@ -93,8 +94,8 @@ CanvasNoteEvent::hide_velocity()
        if (_text) {
                _text->hide();
                delete _text;
+               _text = 0;
        }
-       _text = 0;
 }
 
 void 
@@ -166,11 +167,9 @@ CanvasNoteEvent::selected(bool selected)
                                ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5));
                set_outline_color(calculate_outline(
                                ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get()));
-               show_velocity();
        } else {
                set_fill_color(base_color());
                set_outline_color(calculate_outline(base_color()));
-               hide_velocity();
        }
 
        _selected = selected;
@@ -260,17 +259,17 @@ CanvasNoteEvent::on_event(GdkEvent* ev)
 
        case GDK_ENTER_NOTIFY:
                _region.note_entered(this);
-               _item->grab_focus();
-               show_velocity();
-               Keyboard::magic_widget_grab_focus();
+               //_item->grab_focus();
+               //show_velocity();
+               //Keyboard::magic_widget_grab_focus();
                break;
 
        case GDK_LEAVE_NOTIFY:
-               Keyboard::magic_widget_drop_focus();
+               //Keyboard::magic_widget_drop_focus();
                if (! selected()) {
                        hide_velocity();
                }
-               _region.get_canvas_group()->grab_focus();
+               //_region.get_canvas_group()->grab_focus();
                break;
 
        case GDK_BUTTON_PRESS:
@@ -288,8 +287,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev)
                switch (_state) {
                case Pressed: // Drag begin
                        if (midi_edit_mode == Editing::MidiEditSelect
-                                       && _region.mouse_state() != MidiRegionView::SelectTouchDragging
-                                       && _region.mouse_state() != MidiRegionView::EraseTouchDragging) {
+                                       && _region.mouse_state() != MidiRegionView::SelectTouchDragging) {
                                _item->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
                                                Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
                                _state = Dragging;