X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Ftext.h;h=f72c08856635612fb3e1632700bcde07371cde9c;hb=2a5921ecf159d49597264a9328dc899bba55e57e;hp=59d2007ceba17d30828d9f2874eaac3318b70e2d;hpb=4886eb709824774ecbbe161adca8243e537dfd6e;p=ardour.git

diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h
index 59d2007ceb..f72c088566 100644
--- a/libs/canvas/canvas/text.h
+++ b/libs/canvas/canvas/text.h
@@ -31,14 +31,17 @@ namespace ArdourCanvas {
 class LIBCANVAS_API Text : public Item
 {
 public:
-	Text (Group *);
+	Text (Canvas*);
+	Text (Item*);
        ~Text();
 
 	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 	void compute_bounding_box () const;
 
+        ArdourCanvas::Color color () const { return _color; }
+	void set_color (ArdourCanvas::Color);
+
 	void set (std::string const &);
-	void set_color (uint32_t);
 	void set_font_description (Pango::FontDescription);
 	void set_alignment (Pango::Alignment);
 
@@ -50,16 +53,17 @@ public:
 	std::string text() const { return _text; }
 
 private:
-	std::string      _text;
-	uint32_t         _color;
+	std::string             _text;
+        ArdourCanvas::Color     _color;
 	Pango::FontDescription* _font_description;
-	Pango::Alignment _alignment;
+	Pango::Alignment        _alignment;
         mutable Cairo::RefPtr<Cairo::ImageSurface> _image;
-        mutable Duple _origin;
-        mutable double _width;
-        mutable double _height;
-        mutable bool _need_redraw;
-        double _clamped_width;
+        mutable Duple          _origin;
+        mutable double         _width;
+        mutable double         _height;
+        mutable bool           _need_redraw;
+        mutable double         _width_correction;
+        double                 _clamped_width;
 
         void redraw (Cairo::RefPtr<Cairo::Context>) const;
         void redraw (Glib::RefPtr<Pango::Context>) const;