PBD::Signal0<void> MeterStrip::MetricChanged;
PBD::Signal0<void> MeterStrip::ConfigurationChanged;
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * ARDOUR_UI::ui_scale))
+
MeterStrip::MeterStrip (int metricmode, MeterType mt)
: AxisView(0)
, RouteUI(0)
_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));
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);
, _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);
_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;
ARDOUR_UI::instance()->set_tip (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_ellisize_width(48 * PANGO_SCALE);
- name_label.set_size_request(18, 50);
+ name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
+ 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());
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.set_layout_ellisize_width(18 * PANGO_SCALE);
+ 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);
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();
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));
std::string
MeterStrip::state_id() const
{
- return string_compose ("mtrs %1", _route->id().to_s());
+ if (_route) {
+ return string_compose ("mtrs %1", _route->id().to_s());
+ } else {
+ return string ();
+ }
}
void
MeterStrip::set_button_names()
{
- mute_button->set_text (_("M"));
+ mute_button->set_text (S_("Mute|M"));
if (_route && _route->solo_safe()) {
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
}
if (!Config->get_solo_control_is_listen_control()) {
- solo_button->set_text (_("S"));
+ solo_button->set_text (S_("Solo|S"));
} else {
switch (Config->get_listen_position()) {
case AfterFaderListen:
- solo_button->set_text (_("A"));
+ solo_button->set_text (S_("AfterFader|A"));
break;
case PreFaderListen:
- solo_button->set_text (_("P"));
+ solo_button->set_text (S_("PreFader|P"));
break;
}
}
- monitor_input_button->set_text (_("I"));
- monitor_disk_button->set_text (_("D"));
+ monitor_input_button->set_text (S_("MonitorInput|I"));
+ monitor_disk_button->set_text (S_("MonitorDisk|D"));
}
void
// NB numbers are rotated 90deg. on the meterbridge
tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_with_of_digit_0_to_9()
}
- namebx.set_size_request(18, nh + tnh);
- namenumberbx.set_size_request(18, nh + tnh);
+
+ nh *= ARDOUR_UI::ui_scale;
+ tnh *= ARDOUR_UI::ui_scale;
+
+ int prev_height, ignored;
+ bool need_relayout = false;
+
+ 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 (PX_SCALE(18, 18), nh + tnh);
+
+ if (prev_height != nh + tnh) {
+ need_relayout = true;
+ }
+
if (_route) {
- name_label.set_size_request(18, nh + (_route->is_master() ? tnh : -1));
- name_label.set_layout_ellisize_width ((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
+ int nlh = nh + (_route->is_master() ? tnh : -1);
+ name_label.get_size_request(ignored, prev_height);
+ 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;
+ }
}
+
VBox::on_size_allocate(a);
+
+ if (need_relayout) {
+ queue_resize();
+ MetricChanged(); // force re-layout, parent on_scroll(), queue_resize()
+ }
}
gint
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();
}
}
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 * ARDOUR_UI::ui_scale);
} else {
number_label.hide();
}
_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);
projects / ardour.git / blobdiff