Put the timecode next to the rewind-to-0 button to help avoid mouse-slips (#1234).

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

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index ac3a02ce95f65ce08f44871030e33703c2635ad2..bdb365158c7e743e51506792ca4d2e7b078d5f9f 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -25,7 +25,6 @@
 #include "lib/compose.hpp"
 #include "lib/log.h"
 #include <wx/notebook.h>
-#include <wx/display.h>
 #include <boost/foreach.hpp>
 
 using std::list;
@@ -41,13 +40,6 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
        SetScrollRate (8, 8);
        SetSizer (_sizer);
 
-       /* This is a hack to try and make the content notebook a sensible size; large on big displays but small
-          enough on small displays to leave space for the content area.
-       */
-       wxDisplay display (wxDisplay::GetFromWindow(p->notebook()));
-       wxRect screen = display.GetClientArea();
-       SetMinSize (wxSize(-1, screen.height > 800 ? 600 : 320));
-
        _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        _sizer->Add (_grid, 0, wxALL, 8);
 
@@ -82,7 +74,7 @@ ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, sha
        note->SetLabel (s);
        note->Wrap (400);
 
-       if (s.IsEmpty ()) {
+       if (s.IsEmpty() || Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
                note->Hide ();
        } else {
                note->Show ();