From ef07d47bf870e1811a70fe41e644b56a4ce780b1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 10 Dec 2021 15:15:16 -0700 Subject: [PATCH] audio clip editor: use scroll group for waves container --- gtk2_ardour/audio_clip_editor.cc | 2 +- gtk2_ardour/audio_clip_editor.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/audio_clip_editor.cc b/gtk2_ardour/audio_clip_editor.cc index 2746365319..c100445404 100644 --- a/gtk2_ardour/audio_clip_editor.cc +++ b/gtk2_ardour/audio_clip_editor.cc @@ -71,7 +71,7 @@ AudioClipEditor::AudioClipEditor () frame->set_fill (false); frame->Event.connect (sigc::mem_fun (*this, &AudioClipEditor::event_handler)); - waves_container = new ArdourCanvas::Container (frame); + waves_container = new ArdourCanvas::ScrollGroup (frame, ScrollGroup::ScrollsHorizontally); line_container = new ArdourCanvas::Container (frame); const double line_width = 3.; diff --git a/gtk2_ardour/audio_clip_editor.h b/gtk2_ardour/audio_clip_editor.h index f89d1991cc..414ce7075c 100644 --- a/gtk2_ardour/audio_clip_editor.h +++ b/gtk2_ardour/audio_clip_editor.h @@ -30,14 +30,17 @@ #include "ardour/types.h" #include "ardour/session_handle.h" +#include "gtkmm2ext/actions.h" +#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/cairo_packer.h" #include "widgets/ardour_button.h" #include "canvas/canvas.h" #include "canvas/container.h" -#include "canvas/rectangle.h" #include "canvas/line.h" +#include "canvas/rectangle.h" +#include "canvas/scroll_group.h" #include "audio_clock.h" @@ -79,9 +82,11 @@ class AudioClipEditor : public ArdourCanvas::GtkCanvas void set_spp (double); double spp() const { return _spp; } + bool key_press (GdkEventKey*); + private: ArdourCanvas::Rectangle* frame; - ArdourCanvas::Container* waves_container; + ArdourCanvas::ScrollGroup* waves_container; ArdourCanvas::Container* line_container; ArdourCanvas::Line* start_line; ArdourCanvas::Line* end_line;