From 7670e463cc98c351bc9203ede7d95da06af59b21 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 6 Nov 2014 20:33:29 -0500 Subject: [PATCH] add API to extract color from ArdourCanvas::Text and tidy up member declarations Conflicts: libs/canvas/canvas/text.h --- libs/canvas/canvas/text.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h index 85262ee984..f72c088566 100644 --- a/libs/canvas/canvas/text.h +++ b/libs/canvas/canvas/text.h @@ -38,8 +38,10 @@ public: void render (Rect const &, Cairo::RefPtr) 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); @@ -51,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 _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) const; void redraw (Glib::RefPtr) const;