ardour/livetrax
13
0
Fork 0
Code

add API to extract color from ArdourCanvas::Text and tidy up member declarations

Browse Source 
Conflicts:
	libs/canvas/canvas/text.h
This commit is contained in:
Paul Davis 2014-11-06 20:33:29 -05:00
parent 787f9748b6
commit 7670e463cc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/canvas/canvas/text.h
View File

@ -38,8 +38,10 @@ public:
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);
@ -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<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;