X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fentry.cpp;h=f5037215592e1a45143ab8b305cf563007c7dbe0;hb=c72566cd7f8252eb386c753ceeafa8a324d1120b;hp=7f50ed038fbdd6cc4a758adcc0973d84f550b726;hpb=d7274749cb0e171e59d7dc9d7d1712906a351119;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 7f50ed0..f503721 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -16,17 +16,16 @@ Distributed under the LGPL
 
 using namespace std;
 
-#include <iostream>
-
 namespace Msp {
 namespace GLtk {
 
 Entry::Entry(const Resources &r, const string &t):
 	Widget(r),
-	text(t),
-	edit_pos(text.size())
+	text(style),
+	edit_pos(0)
 {
 	update_style();
+	set_text(t);
 }
 
 void Entry::set_text(const string &t)
@@ -52,6 +51,8 @@ void Entry::key_press(unsigned key, unsigned, wchar_t ch)
 		if(edit_pos>0)
 			text.erase(--edit_pos, 1);
 	}
+	else if(key==Input::KEY_ENTER)
+		signal_enter.emit();
 	else if(ch>=' ')
 	{
 		text.insert(edit_pos, Codecs::encode<Codecs::Utf8>(Codecs::ustring(1, ch)));
@@ -62,7 +63,7 @@ void Entry::key_press(unsigned key, unsigned, wchar_t ch)
 void Entry::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		text.render(part, geom);
 	else if(part.get_name()=="cursor")
 	{
 		if(!part.get_graphic(state))
@@ -72,8 +73,8 @@ void Entry::render_special(const Part &part) const
 		const float font_size=font->get_default_size();
 
 		Geometry rgeom=part.get_geometry();
-		rgeom.x=static_cast<unsigned>(font->get_string_width(text.substr(0, edit_pos))*font_size);
-		rgeom.w=static_cast<unsigned>(font->get_string_width(text)*font_size);
+		rgeom.x=static_cast<unsigned>(font->get_string_width(text.get().substr(0, edit_pos))*font_size);
+		rgeom.w=static_cast<unsigned>(font->get_string_width(text.get())*font_size);
 		part.get_alignment().apply(rgeom, geom, part.get_margin());
 
 		GL::push_matrix();