diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-04 22:06:11 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:08 +0200 |
| commit | 8574be424e4e00c5fd5eac7680cad9a401402937 (patch) | |
| tree | 15141e106ea4f213ffb47a33176ee08e06e2b8f6 /gtk2_ardour | |
| parent | 42ee64e950b02aaf98613fe520643f33ff9414fd (diff) | |
meterbridge - change label size with height
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 11 | ||||
| -rw-r--r-- | gtk2_ardour/meterbridge.cc | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index ea610f2550..43d18b628a 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -65,7 +65,7 @@ MeterStrip::MeterStrip (int metricmode) set_spacing(2); peakbx.set_size_request(-1, 14); btnbox.set_size_request(-1, 16); - namebx.set_size_request(14, 52); + namebx.set_size_request(18, 52); _types.clear (); switch(metricmode) { @@ -325,6 +325,15 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a) { metric_patterns.clear(); ticks_patterns.clear(); + const int wh = a.get_height(); + int nh = ceilf(wh * .11f); + if (nh < 52) nh = 52; + if (nh > 148) nh = 148; + namebx.set_size_request(18, nh); + if (_route) { + name_label.set_size_request(18, nh-2); + name_label.layout()->set_width((nh-4) * PANGO_SCALE); + } VBox::on_size_allocate(a); } diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index 5adc7d7f7b..6ab84d9874 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -127,7 +127,7 @@ Meterbridge::Meterbridge () Gdk::Geometry geom; geom.max_width = 1<<16; - geom.max_height = 1024 + 52 + 16 + 12 ; // XXX see FastMeter::max_pattern_metric_size + meter-strip widgets + geom.max_height = 1024 + 148 + 16 + 12 ; // see FastMeter::max_pattern_metric_size + meter-strip widgets set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE); set_keep_above (true); |