ask TAV buttons to have square proportions

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 60fad0db328c67d7d04e1bf623f92a5014ed5c44..034f1fc665e28711794bff4b147f9c82baf6c314 100644 (file)
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -602,6 +602,13 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
        }
 
        req->width += _corner_radius;
+
+       if ((_tweaks & Square)==Square) {
+               if (req->width < req->height)
+                       req->width = req->height;
+               if (req->height < req->width)
+                       req->height = req->width;
+       }
 }
 
 /**

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 393df43b365aeac069af3cad0a1da0712fab2094..53869c89bc29145e0530aa4a16429dd3a6dfddc3 100644 (file)
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -53,7 +53,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        virtual ~ArdourButton ();
 
        enum Tweaks {
-               unused1 = 0x1,
+               Square = 0x1,
                unused2 = 0x2,
                unused3 = 0x4,
        };

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 90cb341c6967b3b494a7957f8114af92d93eba32..c6e2689021125bfbe01368760aaadaf5918c8601 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -251,6 +251,14 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
        ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
 
+       mute_button->set_tweaks(ArdourButton::Square);
+       solo_button->set_tweaks(ArdourButton::Square);
+       rec_enable_button->set_tweaks(ArdourButton::Square);
+       playlist_button.set_tweaks(ArdourButton::Square);
+       automation_button.set_tweaks(ArdourButton::Square);
+       route_group_button.set_tweaks(ArdourButton::Square);
+       number_label.set_tweaks(ArdourButton::Square);
+
        if (is_midi_track()) {
                ARDOUR_UI::instance()->set_tip(automation_button, _("MIDI Controllers and Automation"));
        } else {