ardour/livetrax
13
0
Fork 0
Code

meterbridge label rework - phase one (better, but not good)

Browse Source
This commit is contained in:
Robin Gareus 2013-07-09 19:47:39 +02:00
parent c3a6b94090
commit 56f4341ade
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/ardour3_widget_list.rc
View File

@ -352,7 +352,6 @@ widget "*ProcessorList*" style:highest "processor_list"
widget "*PortMatrixLabel*" style:highest "small_text"
widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
widget "*solo isolate" style:highest "solo_isolate"
widget "*meterbridge numlabel" style:highest "large_bold_text"
widget "*meterbridge label" style:highest "meterbridge_label"
widget "*solo safe" style:highest "solo_safe"
widget "*ContrastingPopup" style:highest "contrasting_popup"

19
gtk2_ardour/meter_strip.cc
View File

@ -65,7 +65,7 @@ MeterStrip::MeterStrip (int metricmode)
set_spacing(2);
peakbx.set_size_request(-1, 14);
namebx.set_size_request(18, 52);
numbx.set_size_request(18, 42);
numbx.set_size_request(18, 18);
set_metric_mode(metricmode);
@ -149,22 +149,26 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
name_label.set_alignment(-1.0, .5);
ARDOUR_UI::instance()->set_tip (name_label, _route->name());
number_label.set_alignment(1.0, .5);
number_label.set_name("meterbridge numlabel");
number_label.set_alignment(.5, .5);
number_label.set_name("meterbridge label");
number_label.set_corner_radius(2);
number_label.set_size_request(18, 18);
if (_route->unique_id() > 0) {
char buf[12];
snprintf(buf, 12, "%d", _route->unique_id());
number_label.set_text(buf);
number_label.show();
} else {
number_label.set_text("");
number_label.hide();
}
namebx.set_size_request(18, 52);
namebx.pack_start(name_label, true, false, 3);
numbx.set_size_request(18, 42);
numbx.pack_start(number_label, true, false, 0);
numbx.set_size_request(18, 18);
numbx.pack_start(number_label, true, false, 3);
recbox.pack_start(*rec_enable_button, true, false);
btnbox.pack_start(recbox, false, false, 1);
@ -191,11 +195,9 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
pack_start (peakbx, false, false);
pack_start (meterbox, true, true);
pack_start (numbx, false, false);
pack_start (btnbox, false, false);
pack_start (namebx, false, false);
pack_start (numbx, false, false);
number_label.show();
name_label.show();
peak_display.show();
peakbx.show();
@ -429,7 +431,6 @@ MeterStrip::set_metric_mode (int metricmode)
void
MeterStrip::set_pos (int pos)
{
number_label.set_alignment(1.0, pos%2 ? 0.0 : 1.0 );
}
gint

2
gtk2_ardour/meter_strip.h
View File

@ -92,7 +92,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI
Gtk::HBox namebx;
Gtk::HBox numbx;
ArdourButton name_label;
Gtk::Label number_label;
ArdourButton number_label;
Gtk::DrawingArea meter_metric_area;
Gtk::DrawingArea meter_ticks1_area;
Gtk::DrawingArea meter_ticks2_area;