From 89d6f40e33933b12a40079e391a96856bfa79e2a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 4 Mar 2011 15:16:21 +0000 Subject: [PATCH] forward unhandled button events from MidiRegionView back to Editor git-svn-id: svn://localhost/ardour2/branches/3.0@9068 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/midi_region_view.cc | 14 +++++++++++--- gtk2_ardour/time_axis_view_item.cc | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index ab11bb20bf..1d4d420258 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -377,16 +377,20 @@ MidiRegionView::mouse_mode_changed () bool MidiRegionView::button_press (GdkEventButton* ev) { + if (ev->button != 1) { + return false; + } + _last_x = ev->x; _last_y = ev->y; - + group->w2i (_last_x, _last_y); if (_mouse_state != SelectTouchDragging) { - + _pressed_button = ev->button; _mouse_state = Pressed; - + return true; } @@ -401,6 +405,10 @@ MidiRegionView::button_release (GdkEventButton* ev) double event_x, event_y; framepos_t event_frame = 0; + if (ev->button != 1) { + return false; + } + event_x = ev->x; event_y = ev->y; diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index aa9fc24b23..495efd578c 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -243,6 +243,7 @@ TimeAxisViewItem::hide_rect () if (name_highlight) { name_highlight->property_outline_what() = 0x0; + name_highlight->property_fill_color_rgba() = UINT_RGBA_CHANGE_A(fill_color,64); } } @@ -254,6 +255,7 @@ TimeAxisViewItem::show_rect () if (name_highlight) { name_highlight->property_outline_what() = 0x4; + name_highlight->property_fill_color_rgba() = fill_color; } }