diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-08 14:48:28 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-08 14:48:28 -0400 |
commit | bebe2af95ad9999fdca719450dc2c70cfb849076 (patch) | |
tree | 2bf6f4bae48b72c4607751bf370cbb1f2ce70a15 /gtk2_ardour/ardour_window.cc | |
parent | e1b0f1bd0b03c071d2b5987e4ab75ef059e32111 (diff) | |
parent | cadfc2aee13e14af341dd68f33308a421820c855 (diff) |
merge with master
Diffstat (limited to 'gtk2_ardour/ardour_window.cc')
-rw-r--r-- | gtk2_ardour/ardour_window.cc | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc index f16032dc74..eb5b919b52 100644 --- a/gtk2_ardour/ardour_window.cc +++ b/gtk2_ardour/ardour_window.cc @@ -25,6 +25,7 @@ #include "ardour_window.h" #include "ardour_ui.h" #include "keyboard.h" +#include "utils.h" using namespace std; using namespace Gtk; @@ -50,6 +51,13 @@ ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/) ArdourWindow::~ArdourWindow () { + WM::Manager::instance().remove (proxy); +} + +bool +ArdourWindow::on_key_press_event (GdkEventKey* ev) +{ + return relay_key_press (ev, this); } bool @@ -73,6 +81,13 @@ ArdourWindow::on_unmap () Window::on_unmap (); } +bool +ArdourWindow::on_delete_event (GdkEventAny*) +{ + hide (); + return false; +} + void ArdourWindow::init () { @@ -88,8 +103,21 @@ ArdourWindow::init () vice versa. */ - set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); + if (ARDOUR_UI::instance()->config()->get_all_floating_windows_are_dialogs()) { + set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG); + } else { + set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); + } + Gtk::Window* parent = WM::Manager::instance().transient_parent(); + + if (parent) { + set_transient_for (*parent); + } + ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide)); + + proxy = new WM::ProxyTemporary (get_title(), this); + WM::Manager::instance().register_window (proxy); } |