From c7354c8f2052d63b3d4e00da6b57956150c25dbe Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Jul 2016 09:35:20 +0100 Subject: [PATCH] Fix audio matrix view labels when DCP audio channel counts change. --- src/wx/audio_mapping_view.cc | 11 ++++++++++- src/wx/audio_mapping_view.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) 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 const & names) } update_cells (); + setup_sizes (); } void @@ -345,15 +346,23 @@ 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 (); -- 2.30.2