ardour/livetrax
13
0
Fork 0
Code

Fix button sizing for IconRenderCallback

Browse Source
This commit is contained in:
Robin Gareus 2017-02-17 20:51:15 +01:00
parent 144bfba2dd
commit b5b9e1d1e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour_button.cc
View File

@ -624,7 +624,7 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
* of text. * of text.
*/ */
} else { //if (!_text.empty() || !_sizing_text.empty()) { } else /*if (!_text.empty() || !_sizing_text.empty()) */ {
req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0)); req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0));
req->width += rint(1.75 * char_pixel_width()); // padding req->width += rint(1.75 * char_pixel_width()); // padding
@ -671,7 +671,7 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
req->width += _diameter + 4; req->width += _diameter + 4;
} }
if (_elements & VectorIcon) { if (_elements & (VectorIcon | IconRenderCallback)) {
assert(!(_elements & Text)); assert(!(_elements & Text));
const int wh = std::max (6., std::max (rint (TRACKHEADERBTNW * char_avg_pixel_width()), ceil (char_pixel_height() * BASELINESTRETCH + 1.))); const int wh = std::max (6., std::max (rint (TRACKHEADERBTNW * char_avg_pixel_width()), ceil (char_pixel_height() * BASELINESTRETCH + 1.)));
req->width += wh; req->width += wh;