From 0cd1db76f04cf2d15bd257763a92ecd92fa534ce Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 25 Jun 2015 20:23:34 +0200
Subject: [PATCH] keep meterbridge on top of editor - see #6386

---
 gtk2_ardour/ardour_ui_dialogs.cc | 4 ++++
 gtk2_ardour/meterbridge.cc       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 0fbb33a7a8..d1efb4d7de 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -402,6 +402,10 @@ ARDOUR_UI::toggle_meterbridge ()
 
 	if (tact->get_active()) {
 		meterbridge->show_window ();
+		meterbridge->present ();
+		if (editor) {
+			meterbridge->set_transient_for (*editor);
+		}
 	} else {
 		meterbridge->hide_window (NULL);
 	}
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 08604b0620..e325ff814b 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -111,7 +111,6 @@ Meterbridge::Meterbridge ()
 	assert(max_height % 16 == 0);
 	set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MIN_SIZE | Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
 
-	set_keep_above (true);
 	set_border_width (0);
 
 	metrics_vpacker_left.pack_start (metrics_left, true, true);
@@ -439,6 +438,7 @@ Meterbridge::set_session (Session* s)
 
 	if (_visible) {
 		show_window();
+		present ();
 		ActionManager::check_toggleaction ("<Actions>/Common/toggle-meterbridge");
 	}
 	start_updating ();