Combine common parts of Column and Row into LinearArrangement

[libs/gltk.git] / source / text.h

diff --git a/source/text.h b/source/text.h
index 0e1afaebd198b3230736d38bf1c198b7cc4dc25c..dc5710bdc2dddd6789de34d0c7ba2ee4816b0878 100644 (file)
--- a/source/text.h
+++ b/source/text.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_TEXT_H_
 #define MSP_GLTK_TEXT_H_
 
@@ -14,6 +7,7 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
+class CachedPart;
 class Geometry;
 class Part;
 class Style;
@@ -31,6 +25,9 @@ private:
                unsigned width;
        };
 
+       struct RenderData;
+       struct CoordsToGeomData;
+
        const Style *style;
        std::string text;
        std::vector<Line> lines;
@@ -53,13 +50,20 @@ public:
        unsigned get_line_length(unsigned) const;
        void offset_to_coords(unsigned, unsigned &, unsigned &) const;
        unsigned coords_to_offset(unsigned, unsigned) const;
-       Geometry coords_to_geometry(unsigned, unsigned) const;
+       Geometry coords_to_geometry(const Part &, const Geometry &, unsigned, unsigned, unsigned) const;
 
-       void render(const Part &, const Geometry &) const;
+       void build(const Part &, const Geometry &, CachedPart &) const;
+       void build(const Part &, const Geometry &, unsigned, CachedPart &) const;
 
        Text &operator=(const std::string &);
 private:
        void find_lines();
+
+       template<typename T, void (Text::*)(unsigned, const Geometry &, T &) const>
+       void process_lines(const Part &, const Geometry &, unsigned, T &) const;
+
+       void build_line(unsigned, const Geometry &, RenderData &) const;
+       void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;
 };
 
 } // namespace GLtk