X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=9deb7eb3e880946e8c124ed397cde4428c23d6b1;hb=30a698f42e3ee6be5a63ea1143413cf8329f444e;hp=3032d834bfda4bacbef7fc21b9e17831d623195d;hpb=9e0cd98ad4fc84e56640ea9a466d3fd0dbccef04;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 3032d834bf..9deb7eb3e8 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -27,6 +27,7 @@
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "pbd/stacktrace.h"
+#include "pbd/unwind.h"
 
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
@@ -82,7 +83,7 @@ Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::midi_scroomer_size_group = Glib::RefP
 void
 TimeAxisView::setup_sizes()
 {
-	name_width_px = ceil (100. * ARDOUR_UI::config()->get_font_scale() / 102400.);
+	name_width_px = ceilf (100.f * ARDOUR_UI::ui_scale);
 }
 
 TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
@@ -102,6 +103,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
 	, _y_position (0)
 	, _editor (ed)
 	, name_entry (0)
+	, ending_name_edit (false)
 	, control_parent (0)
 	, _order (0)
 	, _effective_height (0)
@@ -568,8 +570,16 @@ TimeAxisView::set_height_enum (Height h, bool apply_to_selection)
 }
 
 void
-TimeAxisView::set_height (uint32_t h)
+TimeAxisView::set_height (uint32_t h, TrackHeightMode m)
 {
+	uint32_t lanes = 0;
+	if (m == TotalHeight) {
+		for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+			if ( !(*i)->hidden()) ++lanes;
+		}
+	}
+	h /= (lanes + 1);
+
 	if (h < preset_height (HeightSmall)) {
 		h = preset_height (HeightSmall);
 	}
@@ -590,6 +600,12 @@ TimeAxisView::set_height (uint32_t h)
 		show_selection (_editor.get_selection().time);
 	}
 
+	if (m != OnlySelf) {
+		for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+			(*i)->set_height(h, OnlySelf);
+		}
+	}
+
 	_editor.override_visible_track_count ();
 }
 
@@ -682,6 +698,15 @@ TimeAxisView::end_name_edit (int response)
 	if (!name_entry) {
 		return;
 	}
+
+	if (ending_name_edit) {
+		/* already doing this, and focus out or other event has caused 
+		   us to re-enter this code.
+		*/
+		return;
+	}
+	
+	PBD::Unwinder<bool> uw (ending_name_edit, true);
 	
 	bool edit_next = false;
 	bool edit_prev = false;
@@ -1028,7 +1053,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
 
 		rect = new SelectionRect;
 
-		rect->rect = new ArdourCanvas::TimeRectangle (selection_group);
+		rect->rect = new ArdourCanvas::Rectangle (selection_group);
 		CANVAS_DEBUG_NAME (rect->rect, "selection rect");
 		rect->rect->set_outline (false);
 		rect->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect"));
@@ -1173,7 +1198,7 @@ TimeAxisView::compute_heights ()
 
 	window.add (one_row_table);
 	test_button->set_name ("mute button");
-	test_button->set_text (_("M"));
+	test_button->set_text (S_("Mute|M"));
 	test_button->set_tweaks (ArdourButton::TrackHeader);
 
 	one_row_table.set_border_width (border_width);