diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-18 23:49:07 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-19 11:18:44 -0400 |
| commit | 276e8b48ce5b1b538d0cd49380d2fe1006d63129 (patch) | |
| tree | 220ec2a82dbe21250e7f89edcf33572afaa33b96 /gtk2_ardour | |
| parent | 0d160a865b1f48a83d1b03d02ceff22a21715831 (diff) | |
various fixes for places that used get_font_for_style() ... converted to use UIConfiguration::get_canvasvar_*Font()
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/meter_patterns.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mono_panner.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/stereo_panner.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 2 |
4 files changed, 4 insertions, 8 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<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); diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 7f1c98a0cb..c9f46e12b8 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -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; diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 00000e7071..02ee7708f8 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -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; diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index e3b302f975..1e1e66889f 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; |