ardour/livetrax
13
0
Fork 0
Code

ArdourButton: prepare for [em] based padding

Browse Source
This commit is contained in:
Robin Gareus 2014-09-02 19:23:18 +02:00
parent b184df3286
commit 29b7cb4a05
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk2_ardour/ardour_button.cc
View File

@ -58,6 +58,8 @@ ArdourButton::Element ArdourButton::just_led_default_elements = ArdourButton::El
ArdourButton::ArdourButton (Element e) ArdourButton::ArdourButton (Element e)
: _elements (e) : _elements (e)
, _tweaks (Tweaks (0)) , _tweaks (Tweaks (0))
, _char_pixel_width (0)
, _char_pixel_height (0)
, _text_width (0) , _text_width (0)
, _text_height (0) , _text_height (0)
, _diameter (11.0) , _diameter (11.0)
@ -494,12 +496,7 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
//calc our real width for our string (but ignore the height, because that results in inconsistent button heights) //calc our real width for our string (but ignore the height, because that results in inconsistent button heights)
int ignored; int ignored;
_layout->get_pixel_size (_text_width, ignored); _layout->get_pixel_size (_text_width, ignored);
_text_height = char_pixel_height ();
//calc the height using some text with both ascenders and descenders
std::string t = _layout->get_text();
_layout->set_text ("WjgO"); //what we put here probably doesn't matter, as long as its the same for everyone
_layout->get_pixel_size (ignored, _text_height);
_layout->set_text (t);
if (_text_width + _diameter < 75) { if (_text_width + _diameter < 75) {
xpad = 7; xpad = 7;
@ -803,13 +800,14 @@ ArdourButton::action_toggled ()
void void
ArdourButton::on_style_changed (const RefPtr<Gtk::Style>&) ArdourButton::on_style_changed (const RefPtr<Gtk::Style>&)
{ {
set_colors (); on_name_changed();
build_patterns ();
} }
void void
ArdourButton::on_name_changed () ArdourButton::on_name_changed ()
{ {
_char_pixel_width = 0;
_char_pixel_height = 0;
set_colors (); set_colors ();
build_patterns (); build_patterns ();
} }
@ -953,6 +951,29 @@ ArdourButton::action_sensitivity_changed ()
} }
void
ArdourButton::recalc_char_pixel_geometry ()
{
if (_char_pixel_height > 0 && _char_pixel_width > 0) {
return;
}
if (!_layout) {
_layout = Pango::Layout::create (get_pango_context());
}
// NB. this is not static, since the geometry is different
// depending on the font used.
int w, h;
std::string t = _layout->get_text();
std::string x = _("ABCDEFGHIJLKMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
_layout->set_text (x);
_layout->get_pixel_size (w, h);
_layout->set_text (t);
_char_pixel_height = std::max(4, h);
// number of actual chars in the string (not bytes)
// Glib to the rescue.
Glib::ustring gx(x);
_char_pixel_width = std::max(4, w / (int)gx.size());
}
void void
ArdourButton::action_visibility_changed () ArdourButton::action_visibility_changed ()

7
gtk2_ardour/ardour_button.h
View File

@ -101,6 +101,9 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
void set_fallthrough_to_parent(bool fall) { _fallthrough_to_parent = fall; } void set_fallthrough_to_parent(bool fall) { _fallthrough_to_parent = fall; }
unsigned int char_pixel_width() { if (_char_pixel_width < 1) recalc_char_pixel_geometry() ; return _char_pixel_width; }
unsigned int char_pixel_height() { if (_char_pixel_height < 1) recalc_char_pixel_geometry() ; return _char_pixel_height; }
protected: protected:
void render (cairo_t *, cairo_rectangle_t *); void render (cairo_t *, cairo_rectangle_t *);
void on_size_request (Gtk::Requisition* req); void on_size_request (Gtk::Requisition* req);
@ -124,6 +127,10 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
Tweaks _tweaks; Tweaks _tweaks;
BindingProxy binding_proxy; BindingProxy binding_proxy;
void recalc_char_pixel_geometry ();
unsigned int _char_pixel_width;
unsigned int _char_pixel_height;
int _text_width; int _text_width;
int _text_height; int _text_height;
float _diameter; float _diameter;