summaryrefslogtreecommitdiff
path: root/gtk2_ardour/marker.cc
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2007-07-05 05:33:40 +0000
committerDoug McLain <doug@nostar.net>2007-07-05 05:33:40 +0000
commit291a186cba343ed705c60d15fa7db0b21eb8a1fd (patch)
tree683a299b237164b5a67d2d79e9b05dc2251b8f46 /gtk2_ardour/marker.cc
parent0518b045c62ef764eced6fff0b64d4f71832a7b0 (diff)
New theme manager from trunk, backported to 2.0-ongoing
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2110 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
-rw-r--r--gtk2_ardour/marker.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 6bc34322f5..4065ad978b 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -24,6 +24,7 @@
#include "public_editor.h"
#include "utils.h"
#include "canvas_impl.h"
+#include "ardour_ui.h"
#include "i18n.h"
@@ -255,7 +256,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
}
text->property_y() = 0.0;
text->property_anchor() = Gtk::ANCHOR_NW;
- text->property_fill_color() = "black";
+ text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerLabel.get();
editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition));