From 09908faee84f793deb89e04de36fb1da47ceeb83 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 6 Dec 2024 23:25:37 +0100 Subject: [PATCH] Revert "Always pack nsglview backed canvas in EventBoxExt" This reverts commit c02482086460287bfc95320fc656e55a7fca3c8b. --- gtk2_ardour/trigger_strip.cc | 5 +---- gtk2_ardour/trigger_strip.h | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/gtk2_ardour/trigger_strip.cc b/gtk2_ardour/trigger_strip.cc index 66a1c3bc16..8c2f2d8d61 100644 --- a/gtk2_ardour/trigger_strip.cc +++ b/gtk2_ardour/trigger_strip.cc @@ -132,13 +132,11 @@ TriggerStrip::init () _name_button.set_text_ellipsize (Pango::ELLIPSIZE_END); _name_button.signal_size_allocate ().connect (sigc::mem_fun (*this, &TriggerStrip::name_button_resized)); - _trigger_ebox.add (_trigger_display); - /* strip layout */ global_vpacker.set_spacing (2); global_vpacker.pack_start (input_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (_name_button, Gtk::PACK_SHRINK); - global_vpacker.pack_start (_trigger_ebox, Gtk::PACK_SHRINK); + global_vpacker.pack_start (_trigger_display, Gtk::PACK_SHRINK); global_vpacker.pack_start (_tmaster_widget, Gtk::PACK_SHRINK); global_vpacker.pack_start (_processor_box, true, true); global_vpacker.pack_start (_panners, Gtk::PACK_SHRINK); @@ -173,7 +171,6 @@ TriggerStrip::init () /* Visibility */ _tmaster_widget.show (); _name_button.show (); - _trigger_ebox.show (); _trigger_display.show (); _processor_box.show (); _level_meter.show (); diff --git a/gtk2_ardour/trigger_strip.h b/gtk2_ardour/trigger_strip.h index db367f1de5..2980d22cd3 100644 --- a/gtk2_ardour/trigger_strip.h +++ b/gtk2_ardour/trigger_strip.h @@ -29,7 +29,6 @@ #include "ardour/types.h" #include "widgets/ardour_button.h" -#include "widgets/eventboxext.h" #include "automation_controller.h" #include "axis_view.h" @@ -131,7 +130,6 @@ private: IOButton output_button; ArdourWidgets::ArdourButton _name_button; ProcessorBox _processor_box; - ArdourWidgets::EventBoxExt _trigger_ebox; TriggerBoxWidget _trigger_display; PannerUI _panners; LevelMeterVBox _level_meter;