using boost::dynamic_pointer_cast;
using boost::optional;
using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
-class LimitedSplitter : public wxSplitterWindow
-{
-public:
- LimitedSplitter (wxWindow* parent)
- : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
- {
-
- }
-
- bool OnSashPositionChange (int new_position)
- {
- /* Try to stop the top bit of the splitter getting so small that buttons disappear */
- return new_position > 220;
- }
-};
ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
: _video_panel (0)
, _film_viewer (viewer)
, _generally_sensitive (true)
, _ignore_deselect (false)
+ , _no_check_selection (false)
{
for (int i = 0; i < TEXT_COUNT; ++i) {
_text_panel[i] = 0;
}
_splitter = new LimitedSplitter (n);
- optional<wxRect> screen;
- int const sn = wxDisplay::GetFromWindow(_splitter);
- if (sn >= 0) {
- screen = wxDisplay(sn).GetClientArea();
- }
- wxPanel* top = new wxPanel (_splitter);
+ _top_panel = new wxPanel (_splitter);
_menu = new ContentMenu (_splitter);
-
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _content = new wxListCtrl (top, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
+ _content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
_content->DragAcceptFiles (true);
s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
- _add_file = new Button (top, _("Add file(s)..."));
+ _add_file = new Button (_top_panel, _("Add file(s)..."));
_add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _add_folder = new Button (top, _("Add folder..."));
+ _add_folder = new Button (_top_panel, _("Add folder..."));
_add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files."));
b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _add_dcp = new Button (top, _("Add DCP..."));
+ _add_dcp = new Button (_top_panel, _("Add DCP..."));
_add_dcp->SetToolTip (_("Add a DCP."));
b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _remove = new Button (top, _("Remove"));
+ _remove = new Button (_top_panel, _("Remove"));
_remove->SetToolTip (_("Remove the selected piece of content from the film."));
b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _earlier = new Button (top, _("Earlier"));
+ _earlier = new Button (_top_panel, _("Earlier"));
_earlier->SetToolTip (_("Move the selected piece of content earlier in the film."));
b->Add (_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _later = new Button (top, _("Later"));
+ _later = new Button (_top_panel, _("Later"));
_later->SetToolTip (_("Move the selected piece of content later in the film."));
b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
- _timeline = new Button (top, _("Timeline..."));
+ _timeline = new Button (_top_panel, _("Timeline..."));
_timeline->SetToolTip (_("Open the timeline for the film."));
b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
s->Add (b, 0, wxALL, 4);
- top->SetSizer (s);
+ _top_panel->SetSizer (s);
}
_notebook = new wxNotebook (_splitter, wxID_ANY);
- /* 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.
- */
- if (screen) {
- _splitter->SplitHorizontally (top, _notebook, screen->height > 800 ? -600 : -150);
- }
-
_timing_panel = new TimingPanel (this, _film_viewer);
_notebook->AddPage (_timing_panel, _("Timing"), false);
_timeline->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this));
}
+
+void
+ContentPanel::first_shown ()
+{
+ _splitter->first_shown (_top_panel, _notebook);
+}
+
+
ContentList
ContentPanel::selected ()
{
void
ContentPanel::check_selection ()
{
- if (_last_selected == selected()) {
- /* This was triggered by a re-build of the view but the selection
- did not really change.
- */
+ if (_no_check_selection) {
return;
}
- _last_selected = selected ();
-
setup_sensitivity ();
BOOST_FOREACH (ContentSubPanel* i, panels()) {
void
ContentPanel::set_selection (ContentList cl)
{
+ _no_check_selection = true;
+
ContentList content = _film->content ();
for (size_t i = 0; i < content.size(); ++i) {
if (find(cl.begin(), cl.end(), content[i]) != cl.end()) {
_content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
}
}
+
+ _no_check_selection = false;
+ check_selection ();
}
void
p.push_back (_timing_panel);
return p;
}
+
+
+LimitedSplitter::LimitedSplitter (wxWindow* parent)
+ : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
+ , _first_shown (false)
+ , _top_panel_minimum_size (350)
+{
+ /* This value doesn't really mean much but we just want to stop double-click on the
+ divider from shrinking the bottom panel (#1601).
+ */
+ SetMinimumPaneSize (64);
+
+ Bind (wxEVT_SIZE, boost::bind(&LimitedSplitter::sized, this, _1));
+}
+
+
+void
+LimitedSplitter::first_shown (wxWindow* top, wxWindow* bottom)
+{
+ int const sn = wxDisplay::GetFromWindow(this);
+ if (sn >= 0) {
+ wxRect const screen = wxDisplay(sn).GetClientArea();
+ /* 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.
+ */
+ SplitHorizontally (top, bottom, screen.height > 800 ? -600 : -_top_panel_minimum_size);
+ } else {
+ /* Fallback for when GetFromWindow fails for reasons that aren't clear */
+ SplitHorizontally (top, bottom, -600);
+ }
+ _first_shown = true;
+}
+
+
+void
+LimitedSplitter::sized (wxSizeEvent& ev)
+{
+ if (_first_shown && GetSize().GetHeight() > _top_panel_minimum_size && GetSashPosition() < _top_panel_minimum_size) {
+ /* The window is now fairly big but the top panel is small; this happens when the DCP-o-matic window
+ * is shrunk and then made larger again. Try to set a sensible top panel size in this case (#1839).
+ */
+ SetSashPosition (_top_panel_minimum_size);
+ }
+
+ ev.Skip ();
+}
projects / dcpomatic.git / blobdiff