Much simplier implementation of: "Show Toolbar" act immediately, i.e., even when already maximized, changing this toggle changes whenever toolbar is shown or not.

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

1 files changed, 13 insertions, 14 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e096968b87..939c05b1e8 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3929,36 +3929,35 @@ Editor::session_state_saved (string)
 }
 
 void
-Editor::maximise_editing_space (bool force)
+Editor::update_tearoff_visibility()
 {
-	if (_maximised && !force) {
-		return;
-	}
-
-	fullscreen ();
-
 	bool visible = Config->get_keep_tearoffs();
 	_mouse_mode_tearoff->set_visible (visible);
 	_tools_tearoff->set_visible (visible);
 	_zoom_tearoff->set_visible (visible);
+}
+
+void
+Editor::maximise_editing_space ()
+{
+	if (_maximised) {
+		return;
+	}
+
+	fullscreen ();
 
 	_maximised = true;
 }
 
 void
-Editor::restore_editing_space (bool force)
+Editor::restore_editing_space ()
 {
-	if (!_maximised && !force) {
+	if (!_maximised) {
 		return;
 	}
 
 	unfullscreen();
 
-	bool visible = Config->get_keep_tearoffs();
-	_mouse_mode_tearoff->set_visible (visible);
-	_tools_tearoff->set_visible (visible);
-	_zoom_tearoff->set_visible (visible);
-
 	_maximised = false;
 }