make canvas flag use NoEventText for its label, and try to set the font (unsuccessful...

git-svn-id: svn://localhost/ardour2/branches/3.0@12664 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index 30299641ede5eecbf156ac72b303f651c5d2d47d..17fe6cabd922404977696e2c0129a529a5310f89 100644 (file)
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -1,6 +1,8 @@
-#include "canvas-flag.h"
 #include <iostream>
+
 #include "ardour_ui.h"
+#include "canvas-flag.h"
+#include "time_axis_view_item.h"
 
 using namespace Gnome::Canvas;
 using namespace std;
@@ -43,9 +45,10 @@ CanvasFlag::set_text(const string& a_text)
 {
        delete_allocated_objects();
 
-       _text = new Text (*this, 0.0, 0.0, a_text);
+       _text = new NoEventText (*this, 0.0, 0.0, a_text);
        _text->property_justification() = Gtk::JUSTIFY_CENTER;
        _text->property_fill_color_rgba() = _outline_color_rgba;
+       _text->property_font_desc() = TimeAxisViewItem::NAME_FONT;
        double flagwidth  = _text->property_text_width()  + 10.0;
        double flagheight = _text->property_text_height() + 3.0;
        _text->property_x() = flagwidth / 2.0;

diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h
index c8b32c72a5abfdfd749586f3091c89a7abb14faf..306694e8701b4dceec80349ea3d76a23db4dd815 100644 (file)
--- a/gtk2_ardour/canvas-flag.h
+++ b/gtk2_ardour/canvas-flag.h
@@ -8,6 +8,7 @@
 
 #include "simplerect.h"
 #include "simpleline.h"
+#include "canvas-noevent-text.h"
 
 class MidiRegionView;
 
@@ -33,7 +34,7 @@ public:
        virtual void set_height (double);
 
 protected:
-       Text*            _text;
+       NoEventText*     _text;
        double           _height;
        guint            _outline_color_rgba;
        guint            _fill_color_rgba;