allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 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)
, _distinct_led_click (false)
, _hovering (false)
, _xpad_request (0)
, _ypad_request (0)
{
ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
}
@@ -433,20 +431,11 @@ ArdourButton::set_corner_radius (float r)
set_dirty ();
}
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);

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_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 ();