From c421f6a5551f0755737f57fbeac6a0157599e0e8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 17 Dec 2012 20:16:07 +0000 Subject: [PATCH] Tidy up still-image UI. --- src/wx/film_editor.cc | 8 ++++---- src/wx/film_viewer.cc | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 908bb3a1e..0243c6afc 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -139,12 +139,12 @@ FilmEditor::make_film_panel () { video_control (add_label_to_sizer (_film_sizer, _film_panel, "Trim frames")); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (s, _film_panel, "Start"); + video_control (add_label_to_sizer (s, _film_panel, "Start")); _dcp_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); - s->Add (_dcp_trim_start); - add_label_to_sizer (s, _film_panel, "End"); + s->Add (video_control (_dcp_trim_start)); + video_control (add_label_to_sizer (s, _film_panel, "End")); _dcp_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); - s->Add (_dcp_trim_end); + s->Add (video_control (_dcp_trim_end)); _film_sizer->Add (s); } diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 3ee761ba4..8cc4776d1 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -99,6 +99,8 @@ FilmViewer::film_changed (Film::Property p) calculate_sizes (); get_frame (); _panel->Refresh (); + _slider->Show (_film->content_type() == VIDEO); + _play_button->Show (_film->content_type() == VIDEO); break; } case Film::WITH_SUBTITLES: -- 2.30.2