X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=82acd1dad579dc57de0c66eafbe8b59e47e9d5f1;hb=eedeb4949d16e5415ba790a042c5db6d83580b36;hp=bfba07d1cf3413d60b1e012bf3f2b8fc378ded87;hpb=30d95bbb8c007bf4db96dff86eea9eff6c5eeab1;p=ardour.git

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index bfba07d1cf..82acd1dad5 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -34,11 +34,11 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/rgb_macros.h>
 
-#include "ardour_ui.h"
-#include "global_signals.h"
 #include "logmeter.h"
 #include "gui_thread.h"
 #include "ardour_window.h"
+#include "tooltips.h"
+#include "ui_config.h"
 #include "utils.h"
 
 #include "meterbridge.h"
@@ -59,6 +59,8 @@ PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
 PBD::Signal0<void> MeterStrip::MetricChanged;
 PBD::Signal0<void> MeterStrip::ConfigurationChanged;
 
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))
+
 MeterStrip::MeterStrip (int metricmode, MeterType mt)
 	: AxisView(0)
 	, RouteUI(0)
@@ -68,15 +70,16 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 	_tick_bar = 0;
 	_metricmode = -1;
 	metric_type = MeterPeak;
-	mtr_vbox.set_spacing(2);
-	nfo_vbox.set_spacing(2);
-	peakbx.set_size_request(-1, 14);
-	namebx.set_size_request(18, 52);
-	spacer.set_size_request(-1,0);
+
+	mtr_vbox.set_spacing (PX_SCALE(2, 2));
+	nfo_vbox.set_spacing (PX_SCALE(2, 2));
+	peakbx.set_size_request (-1, PX_SCALE(14, 14));
+	namebx.set_size_request (PX_SCALE(16, 18), PX_SCALE(32, 52));
+	spacer.set_size_request (-1,0);
 
 	set_metric_mode(metricmode, mt);
 
-	meter_metric_area.set_size_request(25, 10);
+	meter_metric_area.set_size_request (PX_SCALE(25, 25), 10);
 	meter_metric_area.signal_expose_event().connect (
 			sigc::mem_fun(*this, &MeterStrip::meter_metrics_expose));
 	RedrawMetrics.connect (sigc::mem_fun(*this, &MeterStrip::redraw_metrics));
@@ -88,7 +91,7 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 	mtr_vbox.pack_start (spacer, false, false);
 	mtr_container.add(mtr_vbox);
 
-	mtr_hsep.set_size_request(-1,1);
+	mtr_hsep.set_size_request (-1, 1);
 	mtr_hsep.set_name("BlackSeparator");
 
 	nfo_vbox.pack_start (mtr_hsep, false, false);
@@ -109,8 +112,8 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 	nfo_vbox.show();
 
 	UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
-	ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
-	DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
 }
 
 MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
@@ -119,8 +122,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	, _route(rt)
 	, peak_display()
 {
-	mtr_vbox.set_spacing(2);
-	nfo_vbox.set_spacing(2);
+	mtr_vbox.set_spacing (PX_SCALE(2, 2));
+	nfo_vbox.set_spacing (PX_SCALE(2, 2));
 	SessionHandlePtr::set_session (sess);
 	RouteUI::init ();
 	RouteUI::set_route (rt);
@@ -130,6 +133,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	_metricmode = -1;
 	metric_type = MeterPeak;
 
+	// note: level_meter->setup_meters() does the scaling
 	int meter_width = 6;
 	if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
 		meter_width = 12;
@@ -154,33 +158,33 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	// peak display
 	peak_display.set_name ("meterbridge peakindicator");
 	peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
-	ARDOUR_UI::instance()->set_tip (peak_display, _("Reset Peak"));
+	set_tooltip (peak_display, _("Reset Peak"));
 	max_peak = minus_infinity();
 	peak_display.unset_flags (Gtk::CAN_FOCUS);
-	peak_display.set_size_request(12, 8);
-	peak_display.set_corner_radius(2);
+	peak_display.set_size_request(PX_SCALE(12, 12), PX_SCALE(8, 8));
+	peak_display.set_corner_radius(2); // ardour-button scales this
 
 	peak_align.set(0.5, 1.0, 1.0, 0.8);
 	peak_align.add(peak_display);
-	peakbx.pack_start(peak_align, true, true, 3);
-	peakbx.set_size_request(-1, 14);
+	peakbx.pack_start(peak_align, true, true, 2);
+	peakbx.set_size_request(-1, PX_SCALE(14, 14));
 
 	// add track-name & -number label
 	number_label.set_text("-");
-	number_label.set_size_request(18, 18);
+	number_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(18, 18));
 
 	name_changed();
 
-	name_label.set_corner_radius(2);
+	name_label.set_corner_radius(2); // ardour button scales radius
 	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.set_text_ellipsize (Pango::ELLIPSIZE_END);
 	name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
-	name_label.set_size_request(18, 50);
+	name_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(50, 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());
+	set_tooltip (name_label, _route->name());
+	set_tooltip (*level_meter, _route->name());
 
 	number_label.set_corner_radius(2);
 	number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
@@ -189,7 +193,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	number_label.set_layout_ellipsize_width(18 * PANGO_SCALE);
 	number_label.set_alignment(.5, .5);
 
-	namebx.set_size_request(18, 52);
+	namebx.set_size_request(PX_SCALE(18, 18), PX_SCALE(52, 52));
 	namebx.pack_start(namenumberbx, true, false, 0);
 	namenumberbx.pack_start(name_label, true, false, 0);
 	namenumberbx.pack_start(number_label, false, false, 0);
@@ -207,25 +211,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(18, 18);
+	rec_enable_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
 	mute_button->set_corner_radius(2);
-	mute_button->set_size_request(18, 18);
+	mute_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
 	solo_button->set_corner_radius(2);
-	solo_button->set_size_request(18, 18);
+	solo_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
 	monitor_input_button->set_corner_radius(2);
-	monitor_input_button->set_size_request(18, 18);
+	monitor_input_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
 	monitor_disk_button->set_corner_radius(2);
-	monitor_disk_button->set_size_request(18, 18);
+	monitor_disk_button->set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 
-	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);
+	mutebox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	solobox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	recbox.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	mon_in_box.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
+	mon_disk_box.set_size_request (PX_SCALE(18, 18), PX_SCALE(18, 18));
 	spacer.set_size_request(-1,0);
 
 	update_button_box();
@@ -284,8 +288,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
 	meter_configuration_changed (_route->shared_peak_meter()->input_streams ());
 
-	meter_ticks1_area.set_size_request(3,-1);
-	meter_ticks2_area.set_size_request(3,-1);
+	meter_ticks1_area.set_size_request(PX_SCALE(3, 3), -1);
+	meter_ticks2_area.set_size_request(PX_SCALE(3, 3), -1);
 	meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose));
 	meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
 
@@ -296,8 +300,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false);
 
 	UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
-	ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
-	DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
+	UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
 	Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
 	sess->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MeterStrip::parameter_changed, this, _1), gui_context());
 
@@ -392,9 +396,9 @@ MeterStrip::strip_property_changed (const PropertyChange& what_changed)
 	}
 	ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed);
 	name_changed();
-	ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+	set_tooltip (name_label, _route->name());
 	if (level_meter) {
-		ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
+		set_tooltip (*level_meter, _route->name());
 	}
 }
 
@@ -411,7 +415,7 @@ MeterStrip::fast_update ()
 	float mpeak = level_meter->update_meters();
 	if (mpeak > max_peak) {
 		max_peak = mpeak;
-		if (mpeak >= ARDOUR_UI::config()->get_meter_peak()) {
+		if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
 			peak_display.set_active_state ( Gtkmm2ext::ExplicitActive );
 		}
 	}
@@ -541,18 +545,21 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
 		tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_with_of_digit_0_to_9()
 	}
 
+	nh *= UIConfiguration::instance().get_ui_scale();
+	tnh *= UIConfiguration::instance().get_ui_scale();
+
 	int prev_height, ignored;
 	bool need_relayout = false;
 
-	namebx.get_size_request(ignored, prev_height);
-	namebx.set_size_request(18, nh + tnh);
+	namebx.get_size_request (ignored, prev_height);
+	namebx.set_size_request (PX_SCALE(18, 18), nh + tnh);
 
 	if (prev_height != nh + tnh) {
 		need_relayout = true;
 	}
 
-	namenumberbx.get_size_request(ignored, prev_height);
-	namenumberbx.set_size_request(18, nh + tnh);
+	namenumberbx.get_size_request (ignored, prev_height);
+	namenumberbx.set_size_request (PX_SCALE(18, 18), nh + tnh);
 
 	if (prev_height != nh + tnh) {
 		need_relayout = true;
@@ -561,8 +568,8 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
 	if (_route) {
 		int nlh = nh + (_route->is_master() ? tnh : -1);
 		name_label.get_size_request(ignored, prev_height);
-		name_label.set_size_request(18, nlh);
-		name_label.set_layout_ellipsize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
+		name_label.set_size_request (PX_SCALE(18, 18), nlh);
+		name_label.set_layout_ellipsize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE); // XXX
 		if (prev_height != nlh) {
 			need_relayout = true;
 		}
@@ -716,32 +723,33 @@ MeterStrip::update_button_box ()
 	if (!_session) return;
 	int height = 0;
 	if (_session->config.get_show_mute_on_meterbridge()) {
-		height += 20;
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
 		mutebox.show();
 	} else {
 		mutebox.hide();
 	}
 	if (_session->config.get_show_solo_on_meterbridge()) {
-		height += 20;
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
 		solobox.show();
 	} else {
 		solobox.hide();
 	}
 	if (_session->config.get_show_rec_on_meterbridge()) {
-		height += 20;
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
 		recbox.show();
 	} else {
 		recbox.hide();
 	}
 	if (_session->config.get_show_monitor_on_meterbridge()) {
-		height += 20 + 20;
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
+		height += PX_SCALE(18, 18) + PX_SCALE(2, 2);
 		mon_in_box.show();
 		mon_disk_box.show();
 	} else {
 		mon_in_box.hide();
 		mon_disk_box.hide();
 	}
-	btnbox.set_size_request(18, height);
+	btnbox.set_size_request(PX_SCALE(18, 18), height);
 	check_resize();
 }
 
@@ -803,7 +811,7 @@ MeterStrip::name_changed () {
 		}
 		const int tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9()
 		// NB numbers are rotated 90deg. on the meterbridge -> use height
-		number_label.set_size_request(18, tnh);
+		number_label.set_size_request(PX_SCALE(18, 18), tnh * UIConfiguration::instance().get_ui_scale());
 	} else {
 		number_label.hide();
 	}
@@ -834,6 +842,7 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
 
 	_suspend_menu_callbacks = true;
 	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB);
 	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
 	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
 	add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);