X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mixer.cc;h=ae045d7a45fbcf5648acadea81b82ff5e7983ca2;hb=fc32ea76423d8dc4d393970531e8249f6811afcb;hp=5f321c7931524a801776fa547db55bc3943d508a;hpb=8b68ed57ec5c075261639435be3290c3ba8177eb;p=ardour.git

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 5f321c7931..ae045d7a45 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -121,7 +121,7 @@ Editor::show_editor_mixer (bool yn)
 		if (current_mixer_strip->get_parent() == 0) {
 			global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
  			global_hpacker.reorder_child (*current_mixer_strip, 0);
-			current_mixer_strip->show_all ();
+			current_mixer_strip->show ();
 		}
 
 	} else {
@@ -156,6 +156,7 @@ Editor::create_editor_mixer ()
 					      _session,
 					      false);
 	current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden));
+	current_mixer_strip->WidthChanged.connect (sigc::mem_fun (*this, &Editor::mixer_strip_width_changed));
 
 #ifdef GTKOSX
 	current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn));
@@ -237,7 +238,16 @@ void
 Editor::maybe_add_mixer_strip_width (XMLNode& node)
 {
 	if (current_mixer_strip) {
-		node.add_property ("mixer-width", enum_2_string (current_mixer_strip->get_width_enum()));
+		node.add_property ("mixer-width", enum_2_string (editor_mixer_strip_width));
 	}
 }
 
+void
+Editor::mixer_strip_width_changed ()
+{
+#ifdef GTKOSX
+	ensure_all_elements_drawn ();
+#endif
+
+	editor_mixer_strip_width = current_mixer_strip->get_width_enum ();
+}