Fix timeline selection under scroll.

[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 dc6c1d2b8666ba94b1f6da86f0824f5e2a65ba2c..bdb365158c7e743e51506792ca4d2e7b078d5f9f 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -35,10 +35,26 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
        : wxScrolledWindow (p->notebook(), wxID_ANY)
        , _parent (p)
        , _sizer (new wxBoxSizer (wxVERTICAL))
+       , _name (name)
 {
-       p->notebook()->AddPage (this, name, false);
-       SetScrollRate (-1, 8);
+       SetScrollRate (8, 8);
        SetSizer (_sizer);
+
+       _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       _sizer->Add (_grid, 0, wxALL, 8);
+
+       _config_connection = Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1));
+}
+
+void
+ContentSubPanel::config_changed (Config::Property p)
+{
+       if (p == Config::INTERFACE_COMPLEXITY) {
+               _grid->Clear ();
+               add_to_grid ();
+               _sizer->Layout ();
+               _grid->Layout ();
+       }
 }
 
 void
@@ -48,13 +64,17 @@ ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, sha
 
        wxString s;
        if (dcp && !can_reference) {
-               s = _("Cannot reference this DCP.  ") + std_to_wx(why_not);
+               if (why_not.empty()) {
+                       s = _("Cannot reference this DCP.");
+               } else {
+                       s = _("Cannot reference this DCP: ") + std_to_wx(why_not);
+               }
        }
 
        note->SetLabel (s);
        note->Wrap (400);
 
-       if (s.IsEmpty ()) {
+       if (s.IsEmpty() || Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
                note->Hide ();
        } else {
                note->Show ();