X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=12eff06ae4ffbc542e3b80726242b60ea03ee4ee;hb=ec63df81f6c3f77454b0fe3bdae24876c84616b1;hp=52a7b429d269e0013e71c44d7d918a9a8dca55b5;hpb=eb6eee5fabf05abca4a0434c2a8f8f62c900afec;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 52a7b42..12eff06 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -16,64 +16,52 @@ namespace GLtk {
 Entry::Entry(const string &t):
 	text(),
 	multiline(false),
+	edit_width(10),
+	edit_height(1),
 	edit_pos(0),
 	first_row(0),
 	visible_rows(1),
 	text_part(0),
-	slider(0)
+	slider(0),
+	got_key_press(false)
 {
 	set_text(t);
 }
 
-void Entry::autosize()
+void Entry::autosize_special(const Part &part, Geometry &ageom)
 {
-	if(!style)
-		return;
-
-	Widget::autosize();
-
-	if(text_part)
+	if(part.get_name()=="text")
 	{
-		const Sides &margin = text_part->get_margin();
+		const Sides &margin = part.get_margin();
 		const GL::Font &font = style->get_font();
 		unsigned en_width = static_cast<unsigned>(font.get_string_width("n")*style->get_font_size());
-		geom.w = max(geom.w, 10*en_width+margin.left+margin.right);
+		ageom.w = max(ageom.w, edit_width*en_width+margin.left+margin.right);
 
 		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
 		if(multiline)
 		{
 			unsigned line_spacing = style->get_font_size()*6/5;
-			geom.h = max(geom.h, line_height+line_spacing*2+margin.top+margin.bottom);
+			ageom.h = max(ageom.h, line_height+line_spacing*(edit_height-1)+margin.top+margin.bottom);
 		}
 		else
-			geom.h = max(geom.h, line_height+margin.top+margin.bottom);
+			ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
 	}
-
-	if(multiline)
+	else if(part.get_name()=="slider" && multiline)
 	{
-		if(const Part *slider_part = style->get_part("slider"))
+		Geometry sgeom = part.get_geometry();
+		if(!sgeom.w || !sgeom.h)
 		{
-			Geometry sgeom = slider_part->get_geometry();
-			if(!sgeom.w || !sgeom.h)
-			{
-				slider->autosize();
-				if(!sgeom.w)
-					sgeom.w = slider->get_geometry().w;
-				if(!sgeom.h)
-					sgeom.h = slider->get_geometry().h;
-			}
-
-			const Sides &margin = slider_part->get_margin();
-			geom.w = max(geom.w, sgeom.w+margin.left+margin.right);
-			geom.h = max(geom.h, sgeom.h+margin.top+margin.bottom);
-
-			reposition_slider();
+			slider->autosize();
+			if(!sgeom.w)
+				sgeom.w = slider->get_geometry().w;
+			if(!sgeom.h)
+				sgeom.h = slider->get_geometry().h;
 		}
 
-		check_view_range();
+		const Sides &margin = part.get_margin();
+		ageom.w = max(ageom.w, sgeom.w+margin.left+margin.right);
+		ageom.h = max(ageom.h, sgeom.h+margin.top+margin.bottom);
 	}
-
-	rebuild();
 }
 
 void Entry::set_text(const string &t)
@@ -87,6 +75,13 @@ void Entry::set_text(const string &t)
 	rebuild();
 }
 
+void Entry::set_edit_size(unsigned w, unsigned h)
+{
+	edit_width = w;
+	edit_height = h;
+	signal_autosize_changed.emit();
+}
+
 void Entry::set_multiline(bool m)
 {
 	multiline = m;
@@ -104,37 +99,30 @@ void Entry::set_multiline(bool m)
 	}
 }
 
-void Entry::rebuild_special(const Part &part, CachedPart &cache)
+void Entry::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, first_row, cache);
+		text.build(part, geom, first_row, part_cache);
 	else if(part.get_name()=="cursor")
 	{
 		const Graphic *graphic = part.get_graphic(state);
-		if(!text_part || !graphic)
-		{
-			cache.texture = 0;
+		if(!text_part || !graphic || !graphic->get_texture())
 			return;
-		}
 
 		unsigned row, col;
 		text.offset_to_coords(edit_pos, row, col);
 
 		if(row<first_row || row>=first_row+visible_rows)
-		{
-			cache.texture = 0;
 			return;
-		}
 
 		Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col);
 
-		cache.texture = graphic->get_texture();
-		cache.clear_mesh();
-
-		GL::MeshBuilder bld(*cache.mesh);
+		GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
 		bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
 		graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
 	}
+	else
+		Widget::rebuild_special(part);
 }
 
 void Entry::render_special(const Part &part, GL::Renderer &renderer) const
@@ -145,6 +133,7 @@ void Entry::render_special(const Part &part, GL::Renderer &renderer) const
 
 void Entry::key_press(unsigned key, unsigned)
 {
+	got_key_press = true;
 	if(key==Input::KEY_LEFT)
 	{
 		if(edit_pos>0)
@@ -191,7 +180,7 @@ void Entry::key_press(unsigned key, unsigned)
 
 void Entry::character(wchar_t ch)
 {
-	if(ch>=' ')
+	if(got_key_press && ch>=' ')
 	{
 		text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
 		++edit_pos;
@@ -199,6 +188,12 @@ void Entry::character(wchar_t ch)
 	}
 }
 
+void Entry::focus_out()
+{
+	Widget::focus_out();
+	got_key_press = false;
+}
+
 void Entry::on_geometry_change()
 {
 	reposition_slider();
@@ -285,9 +280,17 @@ void Entry::slider_value_changed(double value)
 }
 
 
-Entry::Loader::Loader(Entry &ent):
-	Widget::Loader(ent)
-{ }
+Entry::Loader::Loader(Entry &e):
+	DataFile::DerivedObjectLoader<Entry, Widget::Loader>(e)
+{
+	add("edit_size", &Entry::edit_width, &Entry::edit_height);
+	add("multiline", &Loader::multiline);
+}
+
+void Entry::Loader::multiline(bool m)
+{
+	obj.set_multiline(m);
+}
 
 } // namespace GLtk
 } // namespace Msp