From 074ef3c85951a015d62cff49965c775a1a8b8c15 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 5 May 2013 15:07:52 -0400 Subject: fix bigclockwindow's lack of hiding, set ArdourWindow to just-hide-on-delete and add a bit of visibility tracking debugging --- gtk2_ardour/ardour_window.cc | 3 +++ gtk2_ardour/big_clock_window.cc | 2 ++ libs/gtkmm2ext/visibility_tracker.cc | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc index f16032dc74..3d09e59f7c 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; @@ -90,6 +91,8 @@ ArdourWindow::init () set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); + signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), this)); + ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide)); } diff --git a/gtk2_ardour/big_clock_window.cc b/gtk2_ardour/big_clock_window.cc index 7a96293b05..5b369a68c1 100644 --- a/gtk2_ardour/big_clock_window.cc +++ b/gtk2_ardour/big_clock_window.cc @@ -53,6 +53,8 @@ BigClockWindow::BigClockWindow (AudioClock& c) void BigClockWindow::on_unmap () { + ArdourWindow::on_unmap (); + PublicEditor::instance().reset_focus (); } diff --git a/libs/gtkmm2ext/visibility_tracker.cc b/libs/gtkmm2ext/visibility_tracker.cc index 7ba282f3f9..8c7c493812 100644 --- a/libs/gtkmm2ext/visibility_tracker.cc +++ b/libs/gtkmm2ext/visibility_tracker.cc @@ -16,7 +16,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - +#include #include #include "gtkmm2ext/visibility_tracker.h" @@ -35,6 +35,7 @@ bool VisibilityTracker::handle_visibility_notify_event (GdkEventVisibility* ev) { _visibility = ev->state; + std::cerr << "VT: " << _window.get_title() << " vis event, fv = " << fully_visible() << " pv = " << partially_visible() << " nv = " << not_visible() << std::endl; return false; } -- cgit v1.2.3