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 a884c2c10d606b92f3a474f624f1e06f928ba1d2..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);
@@ -207,25 +207,25 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        btnbox.pack_start(solobox, false, false, 1);
 
        rec_enable_button->set_corner_radius(2);
-       rec_enable_button->set_size_request(16, 16);
+       rec_enable_button->set_size_request(18, 18);
 
        mute_button->set_corner_radius(2);
-       mute_button->set_size_request(16, 16);
+       mute_button->set_size_request(18, 18);
 
        solo_button->set_corner_radius(2);
-       solo_button->set_size_request(16, 16);
+       solo_button->set_size_request(18, 18);
 
        monitor_input_button->set_corner_radius(2);
-       monitor_input_button->set_size_request(16, 16);
+       monitor_input_button->set_size_request(18, 18);
 
        monitor_disk_button->set_corner_radius(2);
-       monitor_disk_button->set_size_request(16, 16);
+       monitor_disk_button->set_size_request(18, 18);
 
-       mutebox.set_size_request(16, 16);
-       solobox.set_size_request(16, 16);
-       recbox.set_size_request(16, 16);
-       mon_in_box.set_size_request(16, 16);
-       mon_disk_box.set_size_request(16, 16);
+       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);
        spacer.set_size_request(-1,0);
 
        update_button_box();
@@ -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);
 }
@@ -685,32 +685,32 @@ MeterStrip::update_button_box ()
        if (!_session) return;
        int height = 0;
        if (_session->config.get_show_mute_on_meterbridge()) {
-               height += 18;
+               height += 20;
                mutebox.show();
        } else {
                mutebox.hide();
        }
        if (_session->config.get_show_solo_on_meterbridge()) {
-               height += 18;
+               height += 20;
                solobox.show();
        } else {
                solobox.hide();
        }
        if (_session->config.get_show_rec_on_meterbridge()) {
-               height += 18;
+               height += 20;
                recbox.show();
        } else {
                recbox.hide();
        }
        if (_session->config.get_show_monitor_on_meterbridge()) {
-               height += 18 + 18;
+               height += 20 + 20;
                mon_in_box.show();
                mon_disk_box.show();
        } else {
                mon_in_box.hide();
                mon_disk_box.hide();
        }
-       btnbox.set_size_request(16, height);
+       btnbox.set_size_request(18, height);
        check_resize();
 }