Fix assorted GTK3-related alignment problems.

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

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 44e6b8da1d9162423bdafdfaab261935cfe9e3ff..666547d16b5f00dad69aa65180566e67eb96d98d 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -35,6 +35,7 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
        : wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,
@@ -52,30 +53,43 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
         , _display (new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(640, (640 / 10) + 64)))
        , _track (new wxChoice(this, wxID_ANY))
        , _current_in_lines (false)
+       , _timer (this)
 {
        _lines.resize (CLOSED_CAPTION_LINES);
 
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
        wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (track_sizer, this, _("Track"), true);
+       add_label_to_sizer (track_sizer, this, _("Track"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
        track_sizer->Add (_track, 0, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
 
        sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
        sizer->Add (_display, 1, wxEXPAND);
 
+       Bind (wxEVT_SHOW, boost::bind(&ClosedCaptionsDialog::shown, this, _1));
+       Bind (wxEVT_TIMER, boost::bind(&ClosedCaptionsDialog::update, this));
        _display->Bind (wxEVT_PAINT, boost::bind(&ClosedCaptionsDialog::paint, this));
        _track->Bind (wxEVT_CHOICE, boost::bind(&ClosedCaptionsDialog::track_selected, this));
 
        SetSizerAndFit (sizer);
 }
 
+void
+ClosedCaptionsDialog::shown (wxShowEvent ev)
+{
+       if (ev.IsShown ()) {
+               _timer.Start (40);
+       } else {
+               _timer.Stop ();
+       }
+}
+
 void
 ClosedCaptionsDialog::track_selected ()
 {
        _current = optional<TextRingBuffers::Data> ();
        _viewer->slow_refresh ();
-       update (_last_update);
+       update ();
 }
 
 void
@@ -130,9 +144,9 @@ private:
 };
 
 void
-ClosedCaptionsDialog::update (DCPTime time)
+ClosedCaptionsDialog::update ()
 {
-       _last_update = time;
+       DCPTime const time = _viewer->time ();
 
        if (_current_in_lines && _current && _current->period.to > time) {
                /* Current one is fine */
@@ -151,22 +165,23 @@ ClosedCaptionsDialog::update (DCPTime time)
        if (!_current && !_tracks.empty()) {
                /* We have no current one: get another */
                shared_ptr<Butler> butler = _butler.lock ();
-               DCPOMATIC_ASSERT (butler);
                DCPOMATIC_ASSERT (_track->GetSelection() >= 0);
                DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size()));
                DCPTextTrack track = _tracks[_track->GetSelection()];
-               while (true) {
-                       optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
-                       if (!d) {
-                               break;
-                       }
-                       if (d->track == track) {
-                               _current = d;
-                               break;
+               if (butler) {
+                       while (true) {
+                               optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
+                               if (!d) {
+                                       break;
+                               }
+                               if (d->track == track) {
+                                       _current = d;
+                                       break;
+                               }
                        }
-               }
 
-               _current_in_lines = false;
+                       _current_in_lines = false;
+               }
        }
 
        if (_current && _current->period.contains(time)) {
@@ -191,6 +206,12 @@ ClosedCaptionsDialog::update (DCPTime time)
                Refresh ();
                _current_in_lines = true;
        }
+
+       if (!_current && _tracks.empty()) {
+               for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
+                       _lines[i] = wxString();
+               }
+       }
 }
 
 void
@@ -201,8 +222,15 @@ ClosedCaptionsDialog::clear ()
        Refresh ();
 }
 
+
+void
+ClosedCaptionsDialog::set_butler (weak_ptr<Butler> butler)
+{
+       _butler = butler;
+}
+
 void
-ClosedCaptionsDialog::set_film_and_butler (shared_ptr<Film> film, weak_ptr<Butler> butler)
+ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 {
        _tracks.clear ();
 
@@ -225,5 +253,5 @@ ClosedCaptionsDialog::set_film_and_butler (shared_ptr<Film> film, weak_ptr<Butle
                _track->SetSelection (0);
        }
 
-       _butler = butler;
+       track_selected ();
 }