From c3433d59c0d320f0451df18c9cb06bfd5fff40b0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Aug 2016 00:05:35 +0100 Subject: [PATCH] Hacky window-on-top fix for OS X. --- src/wx/audio_dialog.cc | 7 +++++++ src/wx/timeline_dialog.cc | 7 +++++++ src/wx/video_waveform_dialog.cc | 7 +++++++ 3 files changed, 21 insertions(+) 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, shared_ptr 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 _("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) { -- 2.30.2