From 755aeb74b02a7d1b5bd35d27f043fe479cc5d141 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 11 Dec 2024 08:31:41 -0700 Subject: [PATCH] midi cue view can use midi view's canvas event method directly --- gtk2_ardour/midi_cue_view.cc | 9 ++------- gtk2_ardour/midi_cue_view.h | 1 - gtk2_ardour/midi_view.h | 3 ++- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/midi_cue_view.cc b/gtk2_ardour/midi_cue_view.cc index 02839676ab..995450daf4 100644 --- a/gtk2_ardour/midi_cue_view.cc +++ b/gtk2_ardour/midi_cue_view.cc @@ -65,11 +65,12 @@ MidiCueView::MidiCueView (std::shared_ptr mt, event_rect = new ArdourCanvas::Rectangle (&parent); event_rect->set (ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, 10.)); - event_rect->Event.connect (sigc::mem_fun (*this, &MidiCueView::canvas_event)); event_rect->set_fill (false); event_rect->set_outline (false); CANVAS_DEBUG_NAME (event_rect, "cue event rect"); + parent.Event.connect (sigc::mem_fun (*this, &MidiView::canvas_group_event)); + _note_group->raise_to_top (); automation_group = new ArdourCanvas::Rectangle (&parent); @@ -121,12 +122,6 @@ MidiCueView::drag_group () const return event_rect; } -bool -MidiCueView::canvas_event (GdkEvent* ev) -{ - return MidiView::canvas_group_event (ev); -} - bool MidiCueView::scroll (GdkEventScroll* ev) { diff --git a/gtk2_ardour/midi_cue_view.h b/gtk2_ardour/midi_cue_view.h index 92d57e716f..46e3547b8e 100644 --- a/gtk2_ardour/midi_cue_view.h +++ b/gtk2_ardour/midi_cue_view.h @@ -50,7 +50,6 @@ class MidiCueView : public MidiView ~MidiCueView(); - bool canvas_event (GdkEvent*); void set_samples_per_pixel (double); void set_height (double); diff --git a/gtk2_ardour/midi_view.h b/gtk2_ardour/midi_view.h index 072a8b3da1..4b9322bcb9 100644 --- a/gtk2_ardour/midi_view.h +++ b/gtk2_ardour/midi_view.h @@ -351,6 +351,8 @@ class MidiView : public virtual sigc::trackable, public LineMerger void show_start (bool yn); void show_end (bool yn); + virtual bool canvas_group_event(GdkEvent* ev); + protected: void init (std::shared_ptr); virtual void region_resized (const PBD::PropertyChange&); @@ -447,7 +449,6 @@ class MidiView : public virtual sigc::trackable, public LineMerger virtual void ghost_add_note (NoteBase*) {} virtual void ghost_sync_selection (NoteBase*) {} - virtual bool canvas_group_event(GdkEvent* ev); bool note_canvas_event(GdkEvent* ev); PBD::ScopedConnectionList connections_requiring_model;