From f681212f425387807262901e1c376209bf070786 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 5 Aug 2021 16:20:56 -0600
Subject: [PATCH] triggerbox (UI): set displayed name when region/name changes

---
 gtk2_ardour/triggerbox_ui.cc | 28 +++++++++++++++++++++-------
 gtk2_ardour/triggerbox_ui.h  |  5 +++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc
index e6fab5e7d4..bbef4a8c60 100644
--- a/gtk2_ardour/triggerbox_ui.cc
+++ b/gtk2_ardour/triggerbox_ui.cc
@@ -34,6 +34,7 @@
 #include "gtkmm2ext/utils.h"
 
 #include "ardour_ui.h"
+#include "gui_thread.h"
 #include "triggerbox_ui.h"
 #include "public_editor.h"
 #include "ui_config.h"
@@ -75,20 +76,34 @@ TriggerEntry::TriggerEntry (Canvas* canvas, ARDOUR::Trigger& t)
 
 	name_text = new Text (this);
 	name_text->set_font_description (UIConfiguration::instance().get_NormalFont());
-	if (_trigger.region()) {
-		name_text->set (short_version (_trigger.region()->name(), 20));
-	} else {
-		/* we need some spaces to have something to click on */
-		name_text->set (X_("     "));
-	}
 	name_text->set_color (Gtkmm2ext::contrasting_text_color (fill_color()));
 	name_text->set_position (Duple (50, 4. * scale));
+
+	_trigger.PropertyChanged.connect (trigger_prop_connection, MISSING_INVALIDATOR, boost::bind (&TriggerEntry::prop_change, this, _1), gui_context());
+
+	prop_change (PropertyChange (ARDOUR::Properties::name));
 }
 
+
 TriggerEntry::~TriggerEntry ()
 {
 }
 
+void
+TriggerEntry::prop_change (PropertyChange const & change)
+{
+	if (change.contains (ARDOUR::Properties::name)) {
+		if (_trigger.region()) {
+			name_text->set (short_version (_trigger.region()->name(), 20));
+		} else {
+			/* we need some spaces to have something to click on */
+			name_text->set (X_("     "));
+		}
+	}
+}
+
+		
+
 /* ---------------------------- */
 
 TriggerBoxUI::TriggerBoxUI (ArdourCanvas::Item* parent, TriggerBox& tb)
@@ -358,7 +373,6 @@ TriggerBoxUI::sample_chosen (int response, size_t n)
 	std::string path = file_chooser->get_filename ();
 
 	_triggerbox.set_from_path (n, path);
-
 }
 
 /* ------------ */
diff --git a/gtk2_ardour/triggerbox_ui.h b/gtk2_ardour/triggerbox_ui.h
index b7fe9b4a7e..2fc93ade11 100644
--- a/gtk2_ardour/triggerbox_ui.h
+++ b/gtk2_ardour/triggerbox_ui.h
@@ -23,6 +23,8 @@
 
 #include <gtkmm/window.h>
 
+#include "pbd/properties.h"
+
 #include "ardour/triggerbox.h"
 
 #include "canvas/box.h"
@@ -56,6 +58,9 @@ class TriggerEntry : public ArdourCanvas::Rectangle
 
   private:
 	ARDOUR::Trigger& _trigger;
+
+	PBD::ScopedConnection trigger_prop_connection;
+	void prop_change (PBD::PropertyChange const & change);
 };
 
 class TriggerBoxUI : public ArdourCanvas::Box