X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=4854340a14f730a1fe90fcc9c847be1ce87514ce;hb=ec63df81f6c3f77454b0fe3bdae24876c84616b1;hp=25acf7da4116427c56b7ab8014dbf29dccb86551;hpb=43ac7c4514658754d09552463425bcd344fb9ded;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 25acf7d..4854340 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
@@ -29,10 +22,13 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
 	{
 	public:
 		Loader(Entry &);
+
+	private:
+		void multiline(bool);
 	};
 
 	sigc::signal<void> signal_enter;
@@ -40,33 +36,47 @@ public:
 private:
 	Text text;
 	bool multiline;
+	unsigned edit_width;
+	unsigned edit_height;
 	unsigned edit_pos;
 	unsigned first_row;
 	unsigned visible_rows;
 	const Part *text_part;
 	VSlider *slider;
+	bool got_key_press;
 
 public:
 	Entry(const std::string & = std::string());
 
 	virtual const char *get_class() const { return "entry"; }
 
-	virtual void autosize();
+private:
+	virtual void autosize_special(const Part &, Geometry &);
 
+public:
 	void set_text(const std::string &);
 	const std::string &get_text() const { return text.get(); }
+
+	/** Sets the minimum size of the editing area, in characters and rows.  This
+	only affects autosizing. */
+	void set_edit_size(unsigned w, unsigned h);
+
 	void set_multiline(bool);
 	bool is_multiline() const { return multiline; }
 
 private:
-	virtual void render_special(const Part &) const;
+	virtual void rebuild_special(const Part &);
+	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
-	virtual void key_press(unsigned, unsigned, wchar_t);
+	virtual void key_press(unsigned, unsigned);
+	virtual void character(wchar_t);
+	virtual void focus_out();
 private:
 	virtual void on_geometry_change();
 	virtual void on_style_change();
 
+	void set_edit_position(unsigned);
 	void reposition_slider();
 	void check_view_range();
 	void slider_value_changed(double);