X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.h;h=243c3a617f6cf2806a2272caf71cf4a44f45121e;hb=01d30637b393b2f8a932b1d943076db580b1e951;hp=03cc787bb741151bff97e264ed6998022b354694;hpb=319cde3c06181ba1c3619567525002926d8b4889;p=libs%2Fgltk.git

diff --git a/source/text.h b/source/text.h
index 03cc787..243c3a6 100644
--- a/source/text.h
+++ b/source/text.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "state.h"
 
 namespace Msp {
 namespace GLtk {
@@ -40,6 +41,7 @@ public:
 
 	unsigned get_width() const;
 	unsigned get_height() const;
+	void autosize(const Part &, Geometry &) const;
 
 	void set(const std::string &);
 	void erase(unsigned, unsigned);
@@ -47,20 +49,21 @@ public:
 	const std::string &get() const { return text; }
 	unsigned size() const { return text.size(); }
 	unsigned get_n_lines() const { return lines.size(); }
+	unsigned get_visible_lines(const Part &, const Geometry &, unsigned *) const;
 	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(const Part &, const Geometry &, unsigned, unsigned, unsigned) const;
 
-	void build(const Part &, const Geometry &, PartCache &) const;
-	void build(const Part &, const Geometry &, unsigned, PartCache &) const;
+	void build(const Part &, State, const Geometry &, PartCache &) const;
+	void build(const Part &, State, const Geometry &, unsigned, PartCache &) 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;
+	template<typename T>
+	void process_lines(const Part &, const Geometry &, unsigned, void (Text::*)(unsigned, const Geometry &, T &) const, T &) const;
 
 	void build_line(unsigned, const Geometry &, RenderData &) const;
 	void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;