X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeterbridge.cc;h=5da4d3fdb55ad1efb3cd5fff5e54abc5ecfa5c79;hb=a3c378cf62939c85bcfa3b4c55b68c9163c5e21e;hp=fe29977b86b0649fcd45654b5dee10bb5133925d;hpb=8deccea615aae9a0be0800d7858ccedcea4133e5;p=ardour.git

diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index fe29977b86..5da4d3fdb5 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -57,6 +57,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
@@ -92,7 +93,7 @@ struct SignalOrderRouteSorter {
 			/* everything comes before b */
 			return true;
 		}
-		return a->order_key (MixerSort) < b->order_key (MixerSort);
+		return a->order_key () < b->order_key ();
 	}
 };
 
@@ -138,7 +139,7 @@ Meterbridge::Meterbridge ()
 
 	signal_delete_event().connect (sigc::mem_fun (*this, &Meterbridge::hide_window));
 	signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
-	Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this, _1), gui_context());
+	Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this), gui_context());
 	MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context());
 	MeterStrip::MetricChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::resync_order, this), gui_context());
 	MeterStrip::ConfigurationChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::queue_resize, this), gui_context());
@@ -338,9 +339,30 @@ Meterbridge::on_size_request (Gtk::Requisition* r)
 
 	Gdk::Geometry geom;
 	Gtk::Requisition mr = meterarea.size_request();
+
 	geom.max_width = mr.width + metrics_left.get_width() + metrics_right.get_width();
 	geom.max_height = max_height;
 
+#ifndef GTKOSX
+	/* on OSX this leads to a constant live-loop: show/hide scrollbar
+	 * on Linux, the window is resized IFF the scrollbar was not visible
+	 */
+	const Gtk::Scrollbar * hsc = scroller.get_hscrollbar();
+	Glib::RefPtr<Gdk::Screen> screen = get_screen ();
+	Gdk::Rectangle monitor_rect;
+	screen->get_monitor_geometry (0, monitor_rect);
+	const int scr_w = monitor_rect.get_width() - 44;
+
+	if (cur_max_width < geom.max_width
+			&& cur_max_width < scr_w
+			&& !(scroller.get_hscrollbar_visible() && hsc)) {
+		int h = r->height;
+		*r = Gtk::Requisition();
+		r->width = geom.max_width;
+		r->height = h;
+	}
+#endif
+
 	if (cur_max_width != geom.max_width) {
 		cur_max_width = geom.max_width;
 		geom.height_inc = 16;
@@ -355,6 +377,10 @@ Meterbridge::on_size_allocate (Gtk::Allocation& a)
 	const Gtk::Scrollbar * hsc = scroller.get_hscrollbar();
 
 	if (scroller.get_hscrollbar_visible() && hsc) {
+		if (!scroll_connection.connected()) {
+			scroll_connection = scroller.get_hscrollbar()->get_adjustment()->signal_value_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll));
+			scroller.get_hscrollbar()->get_adjustment()->signal_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll));
+		}
 		gint scrollbar_spacing;
 		gtk_widget_style_get (GTK_WIDGET (scroller.gobj()),
 				"scrollbar-spacing", &scrollbar_spacing, NULL);
@@ -368,6 +394,41 @@ Meterbridge::on_size_allocate (Gtk::Allocation& a)
 	Gtk::Window::on_size_allocate(a);
 }
 
+void
+Meterbridge::on_scroll()
+{
+	if (!scroller.get_hscrollbar()) return;
+
+	Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+	int leftend = adj->get_value();
+	int rightend = scroller.get_width() + leftend;
+
+	int mm_left = _mm_left;
+	int mm_right = _mm_right;
+	ARDOUR::MeterType mt_left = _mt_left;
+	ARDOUR::MeterType mt_right = _mt_right;
+
+	for (unsigned int i = 0; i < _metrics.size(); ++i) {
+		int sx, dx, dy;
+		int mm = _metrics[i]->get_metric_mode();
+		sx = (mm & 2) ? _metrics[i]->get_width() : 0;
+
+		_metrics[i]->translate_coordinates(meterarea, sx, 0, dx, dy);
+
+		if (dx < leftend && !(mm&2)) {
+			mm_left = mm;
+			mt_left = _metrics[i]->meter_type();
+		}
+		if (dx > rightend && (mm&2)) {
+			mm_right = mm;
+			mt_right = _metrics[i]->meter_type();
+			break;
+		}
+	}
+	metrics_left.set_metric_mode(mm_left, mt_left);
+	metrics_right.set_metric_mode(mm_right, mt_right);
+}
+
 void
 Meterbridge::set_session (Session* s)
 {
@@ -572,10 +633,12 @@ Meterbridge::remove_strip (MeterStrip* strip)
 			break;
 		}
 	}
+
+	resync_order();
 }
 
 void
-Meterbridge::sync_order_keys (RouteSortOrderKey src)
+Meterbridge::sync_order_keys ()
 {
 	Glib::Threads::Mutex::Lock lm (_resync_mutex);
 
@@ -584,6 +647,7 @@ Meterbridge::sync_order_keys (RouteSortOrderKey src)
 
 	int pos = 0;
 	int vis = 0;
+	MeterStrip * last = 0;
 
 	unsigned int metrics = 0;
 	MeterType lmt = MeterPeak;
@@ -635,14 +699,24 @@ Meterbridge::sync_order_keys (RouteSortOrderKey src)
 				vis++;
 		}
 
+		(*i).s->set_tick_bar(0);
+
 		MeterType nmt = (*i).s->meter_type();
 		if (nmt == MeterKrms) nmt = MeterPeak; // identical metrics
+		if (vis == 1) {
+			(*i).s->set_tick_bar(1);
+		}
 
-		if ((*i).visible && nmt != lmt && pos == 0) {
+		if ((*i).visible && nmt != lmt && vis == 1) {
 			lmt = nmt;
 			metrics_left.set_metric_mode(1, lmt);
 		} else if ((*i).visible && nmt != lmt) {
 
+			if (last) {
+				last->set_tick_bar(last->get_tick_bar() | 2);
+			}
+			(*i).s->set_tick_bar((*i).s->get_tick_bar() | 1);
+
 			if (_metrics.size() <= metrics) {
 				_metrics.push_back(new MeterStrip(have_midi ? 2 : 3, lmt));
 				meterarea.pack_start (*_metrics[metrics], false, false);
@@ -674,6 +748,13 @@ Meterbridge::sync_order_keys (RouteSortOrderKey src)
 		}
 
 		meterarea.reorder_child(*((*i).s), pos++);
+		if ((*i).visible) {
+			last = (*i).s;
+		}
+	}
+
+	if (last) {
+		last->set_tick_bar(last->get_tick_bar() | 2);
 	}
 
 	metrics_right.set_metric_mode(have_midi ? 2 : 3, lmt);
@@ -683,12 +764,20 @@ Meterbridge::sync_order_keys (RouteSortOrderKey src)
 		delete (_metrics.back());
 		_metrics.pop_back();
 	}
+
+	_mm_left = metrics_left.get_metric_mode();
+	_mt_left = metrics_left.meter_type();
+	_mm_right = metrics_right.get_metric_mode();
+	_mt_right = metrics_right.meter_type();
+
+	on_scroll();
+	queue_resize();
 }
 
 void
 Meterbridge::resync_order()
 {
-	sync_order_keys(MixerSort);
+	sync_order_keys();
 }
 
 void
@@ -721,6 +810,9 @@ Meterbridge::parameter_changed (std::string const & p)
 	else if (p == "show-name-on-meterbridge") {
 		scroller.queue_resize();
 	}
+	else if (p == "meterbridge-label-height") {
+		scroller.queue_resize();
+	}
 }
 
 void