summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-11-14 15:47:26 +0000
committerCarl Hetherington <cth@carlh.net>2016-11-14 15:48:23 +0000
commitb619f75d4a6acc6591d99423055805ab1932f49d (patch)
treea465bc295cf2b01c298c23764b2f7394b9a52325
parent813e98104323146bd2e8b558fa1da56bc1f982f0 (diff)
parentec551d6af1e0ff59a7f9db27665c8eb5c3ec59a4 (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
-rw-r--r--src/wx/timing_panel.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index d9777834f..49c405f9e 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -145,6 +145,10 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
t = new wxStaticText (this, wxID_ANY, wxT (""));
t->SetLabelMarkup (out);
+#ifdef DCPOMATIC_OSX
+ /* Hack to stop hidden text on some versions of OS X */
+ t->SetMinSize (wxSize (-1, 256));
+#endif
grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6);
/* Completely speculative fix for #891 */