X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=b2ff7ecf1b8d5492548a5b01530b9c2ba05c5fb6;hb=4a00bdf04a8c1a88a3041b409c6a8db601b8adc9;hp=b855779278984731f89deee6fd9782717f9f37a6;hpb=d6454dfb368296a8dc4fc172208e394add5a6b8d;p=ardour.git

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index b855779278..b2ff7ecf1b 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -172,19 +172,21 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	name_changed();
 
 	name_label.set_corner_radius(2);
+	name_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
 	name_label.set_name("meterbridge label");
 	name_label.set_angle(-90.0);
-	name_label.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
-	name_label.layout()->set_width(48 * PANGO_SCALE);
+	name_label.set_text_ellipsize (Pango::ELLIPSIZE_END);
+	name_label.set_layout_ellisize_width(48 * PANGO_SCALE);
 	name_label.set_size_request(18, 50);
 	name_label.set_alignment(-1.0, .5);
 	ARDOUR_UI::instance()->set_tip (name_label, _route->name());
 	ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
 
 	number_label.set_corner_radius(2);
+	number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
 	number_label.set_name("tracknumber label");
 	number_label.set_angle(-90.0);
-	number_label.layout()->set_width(18 * PANGO_SCALE);
+	number_label.set_layout_ellisize_width(18 * PANGO_SCALE);
 	number_label.set_alignment(.5, .5);
 
 	namebx.set_size_request(18, 52);
@@ -205,25 +207,25 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	btnbox.pack_start(solobox, false, false, 1);
 
 	rec_enable_button->set_corner_radius(2);
-	rec_enable_button->set_size_request(16, 16);
+	rec_enable_button->set_size_request(18, 18);
 
 	mute_button->set_corner_radius(2);
-	mute_button->set_size_request(16, 16);
+	mute_button->set_size_request(18, 18);
 
 	solo_button->set_corner_radius(2);
-	solo_button->set_size_request(16, 16);
+	solo_button->set_size_request(18, 18);
 
 	monitor_input_button->set_corner_radius(2);
-	monitor_input_button->set_size_request(16, 16);
+	monitor_input_button->set_size_request(18, 18);
 
 	monitor_disk_button->set_corner_radius(2);
-	monitor_disk_button->set_size_request(16, 16);
+	monitor_disk_button->set_size_request(18, 18);
 
-	mutebox.set_size_request(16, 16);
-	solobox.set_size_request(16, 16);
-	recbox.set_size_request(16, 16);
-	mon_in_box.set_size_request(16, 16);
-	mon_disk_box.set_size_request(16, 16);
+	mutebox.set_size_request(18, 18);
+	solobox.set_size_request(18, 18);
+	recbox.set_size_request(18, 18);
+	mon_in_box.set_size_request(18, 18);
+	mon_disk_box.set_size_request(18, 18);
 	spacer.set_size_request(-1,0);
 
 	update_button_box();
@@ -355,7 +357,6 @@ void
 MeterStrip::set_button_names()
 {
 	mute_button->set_text (_("M"));
-	rec_enable_button->set_markup ("<span color=\"#f46f6f\">\u25CF</span>");
 
 	if (_route && _route->solo_safe()) {
 		solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
@@ -539,7 +540,7 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
 	namenumberbx.set_size_request(18, nh + tnh);
 	if (_route) {
 		name_label.set_size_request(18, nh + (_route->is_master() ? tnh : -1));
-		name_label.layout()->set_width((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
+		name_label.set_layout_ellisize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
 	}
 	VBox::on_size_allocate(a);
 }
@@ -684,32 +685,32 @@ MeterStrip::update_button_box ()
 	if (!_session) return;
 	int height = 0;
 	if (_session->config.get_show_mute_on_meterbridge()) {
-		height += 18;
+		height += 20;
 		mutebox.show();
 	} else {
 		mutebox.hide();
 	}
 	if (_session->config.get_show_solo_on_meterbridge()) {
-		height += 18;
+		height += 20;
 		solobox.show();
 	} else {
 		solobox.hide();
 	}
 	if (_session->config.get_show_rec_on_meterbridge()) {
-		height += 18;
+		height += 20;
 		recbox.show();
 	} else {
 		recbox.hide();
 	}
 	if (_session->config.get_show_monitor_on_meterbridge()) {
-		height += 18 + 18;
+		height += 20 + 20;
 		mon_in_box.show();
 		mon_disk_box.show();
 	} else {
 		mon_in_box.hide();
 		mon_disk_box.hide();
 	}
-	btnbox.set_size_request(16, height);
+	btnbox.set_size_request(18, height);
 	check_resize();
 }