From a28058f5e2f7e7bf3aa5af9e499bda630b7af7bc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Oct 2020 16:39:09 +0200 Subject: [PATCH 1/1] Move LimitedSplitter into the header file. --- src/wx/content_panel.cc | 18 ------------------ src/wx/content_panel.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 3a162d771..2c5fea79b 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -66,24 +66,6 @@ using namespace dcpomatic; 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) - { - /* 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); - } - - 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, weak_ptr viewer) : _video_panel (0) diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index a4a172a7f..7b3217605 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -41,6 +41,27 @@ class TimingPanel; class Film; class FilmViewer; + +class LimitedSplitter : public wxSplitterWindow +{ +public: + LimitedSplitter (wxWindow* parent) + : wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE) + { + /* 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); + } + + bool OnSashPositionChange (int new_position) + { + /* Try to stop the top bit of the splitter getting so small that buttons disappear */ + return new_position > 220; + } +}; + + class ContentPanel : public boost::noncopyable { public: -- 2.30.2