Move panic button to MIDI toolbar (reduce required horizontal space).

git-svn-id: svn://localhost/ardour2/branches/3.0@3864 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 5 deletions

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 5c7c679d72..0c72acf10a 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -28,6 +28,7 @@
 
 #include <pbd/error.h>
 #include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/tearoff.h>
 #include <pbd/memento_command.h>
 #include <pbd/basename.h>
 
@@ -348,11 +349,14 @@ Editor::set_mouse_mode (MouseMode m, bool force)
 		break;
 	}
 
-	if (mouse_mode == MouseNote)
-		midi_toolbar_frame.show();
-	else
-		midi_toolbar_frame.hide();
-
+	if (midi_tools_tearoff) {
+		if (mouse_mode == MouseNote) {
+			midi_tools_tearoff->show();
+		} else {
+			midi_tools_tearoff->hide();
+		}
+	}
+	
 	ignore_mouse_mode_toggle = false;
 	
 	set_canvas_cursor ();