From a8025ae69b2fc6c6f191eefc119582fbdae0b50a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 2 Jan 2026 00:08:36 +0100 Subject: Use non-modal ContentPropertiesDialog. This stops the really annoying behaviour where you drag it and the main DoM frame shrinks (maybe only on Linux). --- src/wx/content_menu.cc | 9 +++++++-- src/wx/content_menu.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 32c5edb01..33aab8980 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -476,8 +476,13 @@ ContentMenu::properties () { auto film = _film.lock (); DCPOMATIC_ASSERT (film); - ContentPropertiesDialog dialog(_parent, film, _content.front()); - dialog.ShowModal(); + if (_content_properties_dialog) { + _content_properties_dialog->Destroy(); + _content_properties_dialog = nullptr; + } + + _content_properties_dialog = new ContentPropertiesDialog(_parent, film, _content.front()); + _content_properties_dialog->Show(); } diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index e7f095390..41695c33f 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -34,6 +34,7 @@ LIBDCP_ENABLE_WARNINGS #include +class ContentPropertiesDialog; class DCPContent; class Film; class FilmViewer; @@ -90,6 +91,8 @@ private: wxMenuItem* _set_dcp_markers; wxMenuItem* _remove; + ContentPropertiesDialog* _content_properties_dialog = nullptr; + wx_ptr _auto_crop_dialog; boost::signals2::scoped_connection _auto_crop_config_connection; boost::signals2::scoped_connection _auto_crop_viewer_connection; -- cgit v1.2.3