projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cairocanvas'
[ardour.git]
/
gtk2_ardour
/
stereo_panner.cc
diff --git
a/gtk2_ardour/stereo_panner.cc
b/gtk2_ardour/stereo_panner.cc
index 718d5f38ee9465d4e3cebcbc66aa60deaa590651..ab923a47be737fece200eed8b01b2792b2f71b12 100644
(file)
--- a/
gtk2_ardour/stereo_panner.cc
+++ b/
gtk2_ardour/stereo_panner.cc
@@
-49,6
+49,7
@@
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
static const int pos_box_size = 8;
static const int lr_box_size = 15;
static const int pos_box_size = 8;
static const int lr_box_size = 15;
@@
-86,9
+87,7
@@
StereoPanner::StereoPanner (boost::shared_ptr<PannerShell> p)
if (!have_font) {
Pango::FontDescription font;
Pango::AttrFontDesc* font_attr;
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;
font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
panner_font_attributes.change(*font_attr);
delete font_attr;
@@
-178,6
+177,11
@@
StereoPanner::on_expose_event (GdkEventExpose*)
r = 0x606060ff;
}
r = 0x606060ff;
}
+ if (_send_mode) {
+ b = rgba_from_style("SendStripBase",
+ UINT_RGBA_R(b), UINT_RGBA_G(b), UINT_RGBA_B(b), 255,
+ "fg");
+ }
/* 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));
/* 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));