Fix audio matrix view labels when DCP audio channel counts change.

2 files changed, 11 insertions, 1 deletions

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 13559ff53..53169ad3e 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -272,6 +272,7 @@ AudioMappingView::set_output_channels (vector<string> const & names)
 	}
 
 	update_cells ();
+	setup_sizes ();
 }
 
 void
@@ -346,14 +347,22 @@ AudioMappingView::mouse_moved_grid (wxMouseEvent& ev)
 void
 AudioMappingView::sized (wxSizeEvent& ev)
 {
+	setup_sizes ();
+	ev.Skip ();
+}
+
+void
+AudioMappingView::setup_sizes ()
+{
 	int const top_height = 24;
 
 	_grid->AutoSize ();
 	_left_labels->SetMinSize (wxSize (LEFT_WIDTH, _grid->GetSize().GetHeight()));
 	_top_labels->SetMinSize (wxSize (_grid->GetSize().GetWidth() + LEFT_WIDTH, top_height));
+	/* Try to make the _top_labels 'actua' size respect the minimum we just set */
+	_top_labels->Fit ();
 	_left_labels->Refresh ();
 	_top_labels->Refresh ();
-	ev.Skip ();
 }
 
 void
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 0201368c2..a1d33ccd6 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -82,6 +82,7 @@ private:
 	void paint_left_labels ();
 	void paint_top_labels ();
 	void mouse_moved_left_labels (wxMouseEvent &);
+	void setup_sizes ();
 
 	void off ();
 	void full ();