From: Carl Hetherington <cth@carlh.net>
Date: Tue, 5 Jul 2016 15:09:29 +0000 (+0100)
Subject: Try wxFRAME_FLOAT_ON_PARENT instead of wxSTAY_ON_TOP (#909).
X-Git-Tag: v2.8.19~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=585de1d31ceb8c42c34552509d9372068a9b45b5;p=dcpomatic.git

Try wxFRAME_FLOAT_ON_PARENT instead of wxSTAY_ON_TOP (#909).
---

diff --git a/ChangeLog b/ChangeLog
index 42d7e92db..0d63da243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-05  c.hetherington  <cth@carlh.net>
+
+	* Fix stay-on-top behaviour of audio/video graphs
+	to only stay on top of other DCP-o-matic windows (#909).
+
 2016-07-04  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.8.18 released.
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 19b5fe759..b7f1f613b 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -47,7 +47,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 		_("Audio"),
 		wxDefaultPosition,
 		wxSize (640, 512),
-		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
 		)
 	, _film (film)
 	, _content (content)
diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index ae4b8f820..e4b09b8ee 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -35,7 +35,7 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
 		_("Video Waveform"),
 		wxDefaultPosition,
 		wxSize (640, 512),
-		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+		wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
 		)
 	, _viewer (viewer)
 {