From 1c5117444f282efc3ad303da352ee5fb424d36f0 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 16 Nov 2024 19:31:28 +0100
Subject: [PATCH] Replace custom TriggerUI pane with Tabbable pane

---
 gtk2_ardour/trigger_page.cc | 27 ++++++++++-----------------
 gtk2_ardour/trigger_page.h  |  1 -
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc
index c805971781..63e3a4ae21 100644
--- a/gtk2_ardour/trigger_page.cc
+++ b/gtk2_ardour/trigger_page.cc
@@ -66,7 +66,7 @@ using namespace Gtk;
 using namespace std;
 
 TriggerPage::TriggerPage ()
-	: Tabbable (_("Cues"), X_("trigger"))
+	: Tabbable (_("Cues"), X_("trigger"), NULL, true, Tabbable::PaneLayout (Tabbable::PaneRight | Tabbable::PaneBottom))
 	, _cue_area_frame (0.5, 0, 1.0, 0)
 	, _cue_box (16, 16 * TriggerBox::default_triggers_per_box)
 	, _master_widget (16, 16)
@@ -151,19 +151,12 @@ TriggerPage::TriggerPage ()
 	table->show_all ();
 
 	_parameter_box.pack_start (*table);
-	_parameter_box.set_no_show_all ();
+	_parameter_box.show ();
 
 	/* Top-level Layout */
 	content_app_bar.add (_application_bar);
-	content_innermost_hbox.add (_pane);
-
-	_pane.add (_strip_group_box);
-	/* we cannot `content_midlevel_vbox.remove(_content_att_bottom)` and add it to the _pane
-	 * because visibility updates are not propagated upward, and the pane will not collapse
-	 * when the _parameter_box is hidden
-	 */
-	_pane.add (_parameter_box);
-
+	content_innermost_hbox.add (_strip_group_box);
+	content_att_bottom.add (_parameter_box);
 	content_att_right.add (_sidebar_notebook);
 
 	/* Show all */
@@ -224,9 +217,9 @@ TriggerPage::showhide_att_bottom (bool yn)
 	_show_bottom_pane = yn;
 
 	if (!_show_bottom_pane) {
-		_parameter_box.hide ();
+		Tabbable::showhide_att_bottom (false);
 	} else if (!Editor::instance ().get_selection ().triggers.empty ()) {
-		_parameter_box.show ();
+		Tabbable::showhide_att_bottom (true);
 	}
 }
 
@@ -445,7 +438,7 @@ TriggerPage::rec_enable_changed (Trigger const * trigger)
 	_midi_trig_box.hide ();
 	_midi_editor->viewport().hide ();
 
-	_parameter_box.hide ();
+	Tabbable::showhide_att_bottom (false);
 
 	TriggerBox& box = trigger->box();
 	TriggerReference ref (trigger->boxptr(), trigger->index());
@@ -469,7 +462,7 @@ TriggerPage::rec_enable_changed (Trigger const * trigger)
 	}
 
 	if (_show_bottom_pane) {
-		_parameter_box.show ();
+		Tabbable::showhide_att_bottom (true);
 	}
 }
 
@@ -485,7 +478,7 @@ TriggerPage::selection_changed ()
 	_midi_trig_box.hide ();
 	_midi_editor->viewport().hide ();
 
-	_parameter_box.hide ();
+	Tabbable::showhide_att_bottom (false);
 
 	if (!selection.triggers.empty ()) {
 		TriggerSelection ts      = selection.triggers;
@@ -511,7 +504,7 @@ TriggerPage::selection_changed ()
 		}
 
 		if (_show_bottom_pane) {
-			_parameter_box.show ();
+			Tabbable::showhide_att_bottom (true);
 		}
 	}
 }
diff --git a/gtk2_ardour/trigger_page.h b/gtk2_ardour/trigger_page.h
index 6f08a06fbe..3f5ad2cc72 100644
--- a/gtk2_ardour/trigger_page.h
+++ b/gtk2_ardour/trigger_page.h
@@ -113,7 +113,6 @@ private:
 
 	Gtkmm2ext::Bindings* bindings;
 
-	ArdourWidgets::VPane _pane;
 	Gtk::HBox            _strip_group_box;
 	Gtk::ScrolledWindow  _strip_scroller;
 	Gtk::HBox            _strip_packer;