fundamentally change ArdourButton PangoLayout handling

[ardour.git] / gtk2_ardour / meter_strip.cc

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index f25a1a1142d09b84c84f687817fe740743a561b2..b2ff7ecf1b8d5492548a5b01530b9c2ba05c5fb6 100644 (file)
--- 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);
 }