smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

revert part of 4091ff175c that caused window/sizing chaos. silly paul

Browse source
This commit is contained in:
Paul Davis 2013-10-12 15:37:55 -04:00
parent e0a3c3f4fa
commit 37522a2f5e
2 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/ardour_button.cc
View file

@ -78,8 +78,6 @@ ArdourButton::ArdourButton (Element e)
, _fixed_diameter (true) , _fixed_diameter (true)
, _distinct_led_click (false) , _distinct_led_click (false)
, _hovering (false) , _hovering (false)
, _xpad_request (0)
, _ypad_request (0)
{ {
ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler)); ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
} }
@ -433,20 +431,11 @@ ArdourButton::set_corner_radius (float r)
set_dirty (); set_dirty ();
} }
void
ArdourButton::set_padding (int x, int y)
{
_xpad_request = x;
_ypad_request = y;
queue_resize ();
}
void void
ArdourButton::on_size_request (Gtk::Requisition* req) ArdourButton::on_size_request (Gtk::Requisition* req)
{ {
int xpad = 0 + _xpad_request; int xpad = 0;
int ypad = 6 + _ypad_request; int ypad = 6;
CairoWidget::on_size_request (req); CairoWidget::on_size_request (req);

5
gtk2_ardour/ardour_button.h
View file

@ -71,8 +71,6 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
void set_rounded_corner_mask (int); void set_rounded_corner_mask (int);
void set_diameter (float); void set_diameter (float);
void set_padding (int x, int y);
void set_text (const std::string&); void set_text (const std::string&);
void set_markup (const std::string&); void set_markup (const std::string&);
void set_angle (const double); void set_angle (const double);
@ -159,9 +157,6 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
bool _distinct_led_click; bool _distinct_led_click;
bool _hovering; bool _hovering;
int _xpad_request;
int _ypad_request;
static bool _flat_buttons; static bool _flat_buttons;
void setup_led_rect (); void setup_led_rect ();