From 7f63055578fdad17f422dc0bfe8f19ab6afa3afc Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 18 Jun 2014 23:49:07 -0400 Subject: [PATCH] various fixes for places that used get_font_for_style() ... converted to use UIConfiguration::get_canvasvar_*Font() Conflicts: gtk2_ardour/mono_panner.cc --- gtk2_ardour/meter_patterns.cc | 2 +- gtk2_ardour/mono_panner.cc | 1 + gtk2_ardour/stereo_panner.cc | 4 +--- gtk2_ardour/time_axis_view_item.cc | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc index 2fa1d73565..c3b5a914ec 100644 --- a/gtk2_ardour/meter_patterns.cc +++ b/gtk2_ardour/meter_patterns.cc @@ -613,7 +613,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector 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); diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index e3f7185b89..8265654f88 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -62,6 +62,7 @@ MonoPanner::MonoPanner (boost::shared_ptr p) , position_binder (position_control) , _dragging (false) { + if (_knob_image[0] == 0) { for (size_t i=0; i < (sizeof(_knob_image)/sizeof(_knob_image[0])); i++) { _knob_image[i] = load_pixbuf (_knob_image_files[i]); diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index b7322a3a92..732ca69f82 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -86,9 +86,7 @@ StereoPanner::StereoPanner (boost::shared_ptr 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; diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 72c4d00b68..3420803895 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -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;