diff options
| author | Robin Gareus <robin@gareus.org> | 2014-09-06 00:41:56 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-09-06 00:41:56 +0200 |
| commit | 4a00bdf04a8c1a88a3041b409c6a8db601b8adc9 (patch) | |
| tree | b8ee8a4d09a840bf9120d257e0ebd32d36c0aa72 /gtk2_ardour/meter_strip.cc | |
| parent | 8fc6205e4ed451d0a27120342ea8cb160e4798e3 (diff) | |
fundamentally change ArdourButton PangoLayout handling
This fixes issues where button text was set during static
initialization where the widget style was not yet available,
and a lot of related issues where the text was set
before style.
Diffstat (limited to 'gtk2_ardour/meter_strip.cc')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index f25a1a1142..b2ff7ecf1b 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -175,8 +175,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) 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()); @@ -186,7 +186,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) 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); @@ -540,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); } |