Fix assorted GTK3-related alignment problems.

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

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 1fd96ea0b2800e012478e478f3f0618c29d76d92..510d373c61364d3b7b2f8b19151dcbb6faa4ed6e 100644 (file)
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,14 +22,16 @@
 #include "video_waveform_plot.h"
 #include "film_viewer.h"
 #include "wx_util.h"
+#include "static_text.h"
 #include <boost/bind.hpp>
 #include <iostream>
 
 using std::cout;
 using boost::bind;
 using boost::weak_ptr;
+using boost::shared_ptr;
 
-VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, FilmViewer* viewer)
+VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
        : wxDialog (
                parent,
                wxID_ANY,
@@ -55,10 +57,10 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
        _component->Append (wxT ("X"));
        _component->Append (wxT ("Y"));
        _component->Append (wxT ("Z"));
-       add_label_to_sizer (controls, this, _("Component"), true);
+       add_label_to_sizer (controls, this, _("Component"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
        controls->Add (_component, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
 
-       add_label_to_sizer (controls, this, _("Contrast"), true);
+       add_label_to_sizer (controls, this, _("Contrast"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
        _contrast = new wxSlider (this, wxID_ANY, 0, 0, 256);
        controls->Add (_contrast, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
 
@@ -66,11 +68,11 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 
        wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL);
        add_label_to_sizer (position, this, _("Image X position"), true);
-       _x_position = new wxStaticText (this, wxID_ANY, "");
+       _x_position = new StaticText (this, "");
        _x_position->SetMinSize (wxSize (64, -1));
        position->Add (_x_position, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
        add_label_to_sizer (position, this, _("component value"), true);
-       _value = new wxStaticText (this, wxID_ANY, "");
+       _value = new StaticText (this, "");
        _value->SetMinSize (wxSize (64, -1));
        position->Add (_value, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
        overall_sizer->Add (position, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
@@ -90,7 +92,7 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
        overall_sizer->SetSizeHints (this);
 
        Bind (wxEVT_SHOW, bind (&VideoWaveformDialog::shown, this, _1));
-       _component->Bind (wxEVT_COMMAND_CHOICE_SELECTED, bind (&VideoWaveformDialog::component_changed, this));
+       _component->Bind (wxEVT_CHOICE, bind (&VideoWaveformDialog::component_changed, this));
        _contrast->Bind (wxEVT_SCROLL_THUMBTRACK, bind (&VideoWaveformDialog::contrast_changed, this));
        _plot->MouseMoved.connect (bind (&VideoWaveformDialog::mouse_moved, this, _1, _2, _3, _4));
 
@@ -106,7 +108,9 @@ VideoWaveformDialog::shown (wxShowEvent& ev)
 {
        _plot->set_enabled (ev.IsShown ());
        if (ev.IsShown ()) {
-               _viewer->refresh ();
+               shared_ptr<FilmViewer> fv = _viewer.lock ();
+               DCPOMATIC_ASSERT (fv);
+               fv->slow_refresh ();
        }
 }