Canvas::Rect::contains() should treat its right/left coordinates as exclusive

[ardour.git] / libs / canvas / canvas / text.h

diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h
index 08e2a469a7a2513333a34d263367117378e57aed..f72c08856635612fb3e1632700bcde07371cde9c 100644 (file)
--- a/libs/canvas/canvas/text.h
+++ b/libs/canvas/canvas/text.h
@@ -1,36 +1,73 @@
+/*
+    Copyright (C) 2011-2013 Paul Davis
+    Author: Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #ifndef __ardour_canvas_text_h__
 #define __ardour_canvas_text_h__
 
 #include <pangomm/fontdescription.h>
 #include <pangomm/layout.h>
 
+#include "canvas/visibility.h"
 #include "canvas/item.h"
 
 namespace ArdourCanvas {
 
-class Text : public Item
+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;
-       XMLNode* get_state () const;
-       void set_state (XMLNode 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);
 
+        void clamp_width (double);
+
+        void set_size_chars (int nchars);
+        void dump (std::ostream&) const;
+
+       std::string text() const { return _text; }
+
 private:
-       Glib::RefPtr<Pango::Layout> layout (Cairo::RefPtr<Cairo::Context>) const;
-       
-       std::string _text;
+       std::string             _text;
+        ArdourCanvas::Color     _color;
        Pango::FontDescription* _font_description;
-       uint32_t _color;
-       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;
+        mutable double         _width_correction;
+        double                 _clamped_width;
+
+        void redraw (Cairo::RefPtr<Cairo::Context>) const;
+        void redraw (Glib::RefPtr<Pango::Context>) const;
+        void _redraw (Glib::RefPtr<Pango::Layout>) const;
 };
 
 }