X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmono_panner.cc;h=0d9981dcf89a123d3ad14c775dc16ad549b0a362;hb=e3dd226ffa562d28758555d67961d95723e2a2f0;hp=e136c05153bd7eef3d14585537ad6b16abbcee2a;hpb=a882e96db1367c26660fd3d3079e9e3e19b1e149;p=ardour.git diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index e136c05153..0d9981dcf8 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -50,6 +50,7 @@ using namespace std; using namespace Gtk; using namespace Gtkmm2ext; +using namespace ARDOUR_UI_UTILS; static const int pos_box_size = 9; static const int lr_box_size = 15; @@ -80,9 +81,7 @@ MonoPanner::MonoPanner (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_SmallBoldMonospaceFont()); font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font)); panner_font_attributes.change(*font_attr); delete font_attr; @@ -158,6 +157,9 @@ MonoPanner::on_expose_event (GdkEventExpose*) t = 0x606060ff; } + if (_send_mode) { + b = ARDOUR_UI::config()->color ("send bg"); + } /* background */ context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b)); context->rectangle (0, 0, width, height); @@ -485,12 +487,12 @@ MonoPanner::on_key_press_event (GdkEventKey* ev) void MonoPanner::set_colors () { - colors.fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerFill(); - colors.outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerOutline(); - colors.text = ARDOUR_UI::config()->get_canvasvar_MonoPannerText(); - colors.background = ARDOUR_UI::config()->get_canvasvar_MonoPannerBackground(); - colors.pos_outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionOutline(); - colors.pos_fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionFill(); + colors.fill = ARDOUR_UI::config()->color_mod ("mono panner fill", "panner fill"); + colors.outline = ARDOUR_UI::config()->color ("mono panner outline"); + colors.text = ARDOUR_UI::config()->color ("mono panner text"); + colors.background = ARDOUR_UI::config()->color ("mono panner bg"); + colors.pos_outline = ARDOUR_UI::config()->color ("mono panner position outline"); + colors.pos_fill = ARDOUR_UI::config()->color_mod ("mono panner position fill", "mono panner position fill"); } void