diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-12 15:37:55 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-12 15:37:55 -0400 |
| commit | 37522a2f5ebd4cad79bf70f5f0a9a5c64e43b48c (patch) | |
| tree | 181d9a7e28407a68c2b05888a77b3415a997ad9a | |
| parent | e0a3c3f4fa341ad44236d21f6e3c71ae449a5543 (diff) | |
revert part of 4091ff175c5204 that caused window/sizing chaos. silly paul
| -rw-r--r-- | gtk2_ardour/ardour_button.cc | 15 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_button.h | 5 |
2 files changed, 2 insertions, 18 deletions
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index b9d523e325..3f118921d6 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -78,8 +78,6 @@ ArdourButton::ArdourButton (Element e) , _fixed_diameter (true) , _distinct_led_click (false) , _hovering (false) - , _xpad_request (0) - , _ypad_request (0) { ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler)); } @@ -434,19 +432,10 @@ ArdourButton::set_corner_radius (float r) } void -ArdourButton::set_padding (int x, int y) -{ - _xpad_request = x; - _ypad_request = y; - - queue_resize (); -} - -void ArdourButton::on_size_request (Gtk::Requisition* req) { - int xpad = 0 + _xpad_request; - int ypad = 6 + _ypad_request; + int xpad = 0; + int ypad = 6; CairoWidget::on_size_request (req); diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h index e236f4594e..65ea10b201 100644 --- a/gtk2_ardour/ardour_button.h +++ b/gtk2_ardour/ardour_button.h @@ -71,8 +71,6 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable void set_rounded_corner_mask (int); void set_diameter (float); - void set_padding (int x, int y); - void set_text (const std::string&); void set_markup (const std::string&); void set_angle (const double); @@ -159,9 +157,6 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable bool _distinct_led_click; bool _hovering; - int _xpad_request; - int _ypad_request; - static bool _flat_buttons; void setup_led_rect (); |