diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-28 00:05:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-28 00:05:35 +0100 |
| commit | c3433d59c0d320f0451df18c9cb06bfd5fff40b0 (patch) | |
| tree | 2e009cf578647223f815e177f4aa8dc6c85ec634 /src | |
| parent | 88e5792ebabaf3936d98f72db92d4cd45be3ed36 (diff) | |
Hacky window-on-top fix for OS X.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/audio_dialog.cc | 7 | ||||
| -rw-r--r-- | src/wx/timeline_dialog.cc | 7 | ||||
| -rw-r--r-- | src/wx/video_waveform_dialog.cc | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index b0867823e..ab591143c 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -49,7 +49,14 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co _("Audio"), wxDefaultPosition, wxSize (640, 512), +#ifdef DCPOMATIC_OSX + /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps + the window above all others (and not just our own) it's better than nothing for now. + */ + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP +#else wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT +#endif ) , _film (film) , _content (content) diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 76a2c45e6..e050c27d9 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -38,7 +38,14 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film) _("Timeline"), wxDefaultPosition, wxSize (640, 512), +#ifdef DCPOMATIC_OSX + /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps + the window above all others (and not just our own) it's better than nothing for now. + */ + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP +#else wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT +#endif ) , _film (film) , _timeline (this, cp, film) diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc index 412ebf8bb..1fd96ea0b 100644 --- a/src/wx/video_waveform_dialog.cc +++ b/src/wx/video_waveform_dialog.cc @@ -36,7 +36,14 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> _("Video Waveform"), wxDefaultPosition, wxSize (640, 512), +#ifdef DCPOMATIC_OSX + /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps + the window above all others (and not just our own) it's better than nothing for now. + */ + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP +#else wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT +#endif ) , _viewer (viewer) { |