ardour/livetrax
13
0
Fork 0
Code

tweak button size request

Browse Source
This commit is contained in:
Robin Gareus 2014-09-03 22:06:45 +02:00
parent ba3eb177c7
commit a2a399d6f9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/ardour_button.cc
View File

@ -570,7 +570,7 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
_text_height = 0; _text_height = 0;
} }
if (_pixbuf) { if ((_elements & RecButton) || _pixbuf) {
xpad = 6; xpad = 6;
} }
@ -598,11 +598,12 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
if ((_elements & RecButton) && !_pixbuf) { if ((_elements & RecButton) && !_pixbuf) {
assert(!(_elements & Text)); assert(!(_elements & Text));
req->width += char_pixel_height(); req->width += std::max(char_pixel_width(), char_pixel_height());
req->height += char_pixel_height(); req->height += std::max(char_pixel_width(), char_pixel_height());
} }
req->width += _corner_radius; req->width += _corner_radius;
req->height += _corner_radius;
if ((_tweaks & Square)==Square) { if ((_tweaks & Square)==Square) {
if (req->width < req->height) if (req->width < req->height)