Fix bad layout in the audio tab.

diff --git a/ChangeLog b/ChangeLog
index 713a25da3e6e4524595a39836f0416bcff75a5dd..04c78f074728f1921330d4f51d0bb3c41303b25b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-11-08  Carl Hetherington  <cth@carlh.net>
 
 2015-11-08  Carl Hetherington  <cth@carlh.net>
 

+       * Fix bad layout in the audio tab (#738).
+

        * Allow configuration of SubRip subtitle colour and outlines.
 
 2015-11-06  Carl Hetherington  <cth@carlh.net>
        * Allow configuration of SubRip subtitle colour and outlines.
 
 2015-11-06  Carl Hetherington  <cth@carlh.net>

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 8e13225c76cd32da086d7c7dcf8829b5ba691bde..b1904107bdd95d7a43f02beecb189239470b5365 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -56,15 +56,11 @@ AudioPanel::AudioPanel (ContentPanel* p)
        grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 
        grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 

-       {
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
-               s->Add (_show);
-               _peak = new wxStaticText (this, wxID_ANY, wxT (""));
-               s->Add (_peak, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
-               grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2));
-               ++r;
-       }
+       _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
+       grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2));
+       _peak = new wxStaticText (this, wxID_ANY, wxT (""));
+       grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
+       ++r;

 
        add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
        _gain = new ContentSpinCtrlDouble<AudioContent> (
 
        add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
        _gain = new ContentSpinCtrlDouble<AudioContent> (