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

various fixes for places that used get_font_for_style() ... converted to use UIConfiguration::get_canvasvar_*Font()

Browse source 
Conflicts:
	gtk2_ardour/mono_panner.cc
This commit is contained in:
Paul Davis 2014-06-18 23:49:07 -04:00
parent 4311b70d4f
commit 7f63055578
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/meter_patterns.cc
View file

@ -613,7 +613,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
Pango::AttrFontDesc* font_attr; Pango::AttrFontDesc* font_attr;
Pango::FontDescription font; Pango::FontDescription font;
font = Pango::FontDescription ("ArdourMono"); font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallMonospaceFont());
double fixfontsize = 81920.0 / (double) ARDOUR::Config->get_font_scale(); double fixfontsize = 81920.0 / (double) ARDOUR::Config->get_font_scale();
font.set_weight (Pango::WEIGHT_NORMAL); font.set_weight (Pango::WEIGHT_NORMAL);

1
gtk2_ardour/mono_panner.cc
View file

@ -62,6 +62,7 @@ MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::PannerShell> p)
, position_binder (position_control) , position_binder (position_control)
, _dragging (false) , _dragging (false)
{ {
if (_knob_image[0] == 0) { if (_knob_image[0] == 0) {
for (size_t i=0; i < (sizeof(_knob_image)/sizeof(_knob_image[0])); i++) { for (size_t i=0; i < (sizeof(_knob_image)/sizeof(_knob_image[0])); i++) {
_knob_image[i] = load_pixbuf (_knob_image_files[i]); _knob_image[i] = load_pixbuf (_knob_image_files[i]);

4
gtk2_ardour/stereo_panner.cc
View file

@ -86,9 +86,7 @@ StereoPanner::StereoPanner (boost::shared_ptr<PannerShell> p)
if (!have_font) { if (!have_font) {
Pango::FontDescription font; Pango::FontDescription font;
Pango::AttrFontDesc* font_attr; Pango::AttrFontDesc* font_attr;
font = Pango::FontDescription ("ArdourMono"); font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallBoldMonospaceFont());
font.set_weight (Pango::WEIGHT_BOLD);
font.set_size(9 * PANGO_SCALE);
font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font)); font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
panner_font_attributes.change(*font_attr); panner_font_attributes.change(*font_attr);
delete font_attr; delete font_attr;

2
gtk2_ardour/time_axis_view_item.cc
View file

@ -72,7 +72,7 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
void void
TimeAxisViewItem::set_constant_heights () TimeAxisViewItem::set_constant_heights ()
{ {
NAME_FONT = get_font_for_style (X_("TimeAxisViewItemName")); NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallFont());
Gtk::Window win; Gtk::Window win;
Gtk::Label foo; Gtk::Label foo;