13
0

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

This commit is contained in:
Paul Davis 2014-06-18 23:49:07 -04:00
parent 0d160a865b
commit 276e8b48ce
4 changed files with 4 additions and 8 deletions

View File

@ -613,7 +613,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
Pango::AttrFontDesc* font_attr;
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();
font.set_weight (Pango::WEIGHT_NORMAL);

View File

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

View File

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

View File

@ -72,7 +72,7 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
void
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::Label foo;