forward-port from 2.X commits 5827-6000 including

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

6 files changed, 32 insertions, 3 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index caa9498869..b25a8a5bce 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -49,6 +49,7 @@
   	       </menu>
                <menuitem action='record-roll'/>
                <menuitem action='Record'/>
+               <menuitem action='ToggleRollMaybe'/>
                <menuitem action='ToggleRollForgetCapture'/>
 	       <menu action="SetLoopMenu">
 	       	       <menuitem action='set-loop-from-edit-range'/>
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 5a28a2f484..13e21b9a63 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -498,7 +498,7 @@ AudioRegionView::set_height (gdouble height)
 			}
 		}
 
-		gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE));
+		gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE) - 2);
 	}
 
 	manage_zero_line ();
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 715800550e..cbeaae9886 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -220,6 +220,27 @@ show_me_the_size (Requisition* r, const char* what)
 	cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
 }
 
+#ifdef GTKOSX
+static void
+pane_size_watcher (Paned* pane)
+{
+       /* if the handle of a pane vanishes into (at least) the tabs of a notebook,
+          it is no longer accessible. so stop that. this doesn't happen on X11,
+          just the quartz backend.
+
+          ugh.
+       */
+
+       int max_width_of_lhs = GTK_WIDGET(pane->gobj())->allocation.width - 25;
+
+       gint pos = pane->get_position ();
+
+       if (pos > max_width_of_lhs) {
+               pane->set_position (max_width_of_lhs);
+       }
+}
+#endif
+
 Editor::Editor ()
 	: _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
 
@@ -588,7 +609,10 @@ Editor::Editor ()
 	edit_pane.pack2 (the_notebook, false, true);
 
 	edit_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-
+#ifdef GTKOSX
+        Glib::PropertyProxy<int> proxy = edit_pane.property_position();
+        proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&edit_pane)));
+#endif
 	top_hbox.pack_start (toolbar_frame, false, true);
 
 	HBox *hbox = manage (new HBox);
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index 8f6b1e46d2..3056b2e3e5 100644
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -103,6 +103,7 @@ This mode provides many different operations on both regions and control points,
 @trans|Transport/ToggleRoll|space|toggle roll
 @epp|Editor/play-edit-range|<@SECONDARY@>space|play edit range
 @epp|Editor/play-from-edit-point-and-return|<@LEVEL4@>space|play from EP \& return
+@trans|Transport/ToggleRollMaybe|<@PRIMARY@><@SECONDARY>space|stop but do not leave loop/range play
 @trans|Transport/ToggleRollForgetCapture|<@PRIMARY@>space|stop and destroy
 @trans|Transport/record-roll|<@TERTIARY@>space|start recording
 
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index efef275eaa..7b5e77ec18 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -176,7 +176,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 		}
 	};
 
-	static const int32_t initial_button_rows = 6;
+	static const int32_t initial_button_rows = 12;
 	static const int32_t initial_button_cols = 1;
 	static const int32_t initial_output_rows = 1;
 	static const int32_t initial_output_cols = 4;
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 381489cf88..c266b80883 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -423,6 +423,9 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
 		chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
 	}
 
+#ifdef GTKOSX
+        chooser.add_shortcut_folder_uri("file:///Volumes");
+#endif
 
 	//add the file chooser
 	{