Merge branch 'video-player' of ssh://houllier/home/carl/git/dvdomatic into video...

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index c3f71917254e197828adcb76f29196d81b9d644a..22fd1cc1434bbbad958677ee67c60dbaa4b272d4 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -611,9 +611,7 @@ FilmEditor::film_changed (Film::Property p)
                break;
        case Film::WITH_SUBTITLES:
                checked_set (_with_subtitles, _film->with_subtitles ());
-               _subtitle_stream->Enable (_film->with_subtitles ());
-               _subtitle_scale->Enable (_film->with_subtitles ());
-               _subtitle_offset->Enable (_film->with_subtitles ());
+               setup_subtitle_control_sensitivity ();
                _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
                break;
        case Film::SUBTITLE_OFFSET:
@@ -846,6 +844,8 @@ FilmEditor::setup_visibility ()
                (*i)->Show (c == STILL);
        }
 
+       _notebook->InvalidateBestSize ();
+       
        _film_sizer->Layout ();
        _film_sizer->SetSizeHints (_film_panel);
        _video_sizer->Layout ();
@@ -856,6 +856,7 @@ FilmEditor::setup_visibility ()
        _subtitle_sizer->SetSizeHints (_subtitle_panel);
 
        _notebook->Fit ();
+       Fit ();
 }
 
 void
@@ -962,9 +963,15 @@ FilmEditor::setup_subtitle_control_sensitivity ()
        }
        
        _with_subtitles->Enable (h);
-       _subtitle_stream->Enable (h);
-       _subtitle_offset->Enable (h);
-       _subtitle_scale->Enable (h);
+
+       bool j = false;
+       if (_film) {
+               j = _film->with_subtitles ();
+       }
+       
+       _subtitle_stream->Enable (j);
+       _subtitle_offset->Enable (j);
+       _subtitle_scale->Enable (j);
 }
 
 void