X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=3ee0b2c2b2c132ef8164f0e66593dabcec07a620;hb=3d84860cb25cf05ed36ee6cbd07d9e58cee52422;hp=b09ecb1f024d131161d76771d6b1a5ff7dd33059;hpb=68c4aa0eaaade8b163cf9b3a96aa640ea16b1def;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index b09ecb1..3ee0b2c 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,26 +1,71 @@
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
+#include "container.h"
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
-class Entry: public Widget
+class VSlider;
+
+/**
+Text entry field.
+
+Special parts:
+
+  text    The current text of the widget.  Graphics are ignored.
+  cursor  Indicates the current input position.  Fill_x is ignored.
+  slider  A vertical slider for multiline entries.
+*/
+class Entry: virtual public Widget, private Container
 {
 public:
-	Entry(const Resources &, const std::string & =std::string());
-	void set_text(const std::string &);
-	void key_press(unsigned, unsigned, wchar_t);
-	void focus_in();
-	void focus_out();
+	class Loader: public Widget::Loader
+	{
+	public:
+		Loader(Entry &);
+	};
+
+	sigc::signal<void> signal_enter;
+
 private:
-	std::string text;
+	Text text;
+	bool multiline;
 	unsigned edit_pos;
-	bool active;
+	unsigned first_row;
+	unsigned visible_rows;
+	const Part *text_part;
+	VSlider *slider;
+
+public:
+	Entry(const std::string & = std::string());
+
+	virtual const char *get_class() const { return "entry"; }
+
+	virtual void autosize();
+
+	void set_text(const std::string &);
+	const std::string &get_text() const { return text.get(); }
+	void set_multiline(bool);
+	bool is_multiline() const { return multiline; }
+
+private:
+	virtual void rebuild_special(const Part &, CachedPart &);
+	virtual void render_special(const Part &, GL::Renderer &) const;
+
+public:
+	virtual void key_press(unsigned, unsigned);
+	virtual void character(wchar_t);
+private:
+	virtual void on_geometry_change();
+	virtual void on_style_change();
 
-	const char *get_class() const { return "entry"; }
-	void render_part(const Part &) const;
+	void set_edit_position(unsigned);
+	void reposition_slider();
+	void check_view_range();
+	void slider_value_changed(double);
 };
 
 } // namespace GLtk