Keep timeline above main window.

diff --git a/ChangeLog b/ChangeLog
index b1c8ff0b294dfe1104cb87b06ac56f9329ca0c04..2dca7ef13205cab19fd06d6fc5f17d6bee3c0a77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-24  Carl Hetherington  <cth@carlh.net>
+
+       * Keep timeline above main window.
+
 2016-08-22  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.9.15 released.

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index aef66d8032fde91e3671aae5eeb138501dfe75c8..76a2c45e61e33a092d7b7e2b2df84b584f5355b2 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -32,7 +32,14 @@ using std::cout;
 using boost::shared_ptr;
 
 TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
-       : wxDialog (cp->panel(), wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+       : wxDialog (
+               cp->panel(),
+               wxID_ANY,
+               _("Timeline"),
+               wxDefaultPosition,
+               wxSize (640, 512),
+               wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+               )
        , _film (film)
        , _timeline (this, cp, film)
 {