X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=16954a70f5774858b34b86622de200abe2a4376b;hb=4b52d16bc895f9d969383d7a7d6a3558c1972cc5;hp=a635101404423e9b64524ad7dfee6b9471b53c24;hpb=319cde3c06181ba1c3619567525002926d8b4889;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index a635101..16954a7 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -25,58 +25,30 @@ Entry::Entry(const string &t):
 	slider(0),
 	got_key_press(false)
 {
+	input_type = INPUT_TEXT;
 	set_text(t);
 }
 
-void Entry::autosize()
+void Entry::autosize_special(const Part &part, Geometry &ageom) const
 {
-	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, edit_width*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*(edit_height-1)+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);
-	}
-
-	if(multiline)
-	{
-		if(const Part *slider_part = style->get_part("slider"))
-		{
-			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();
-		}
-
-		check_view_range();
+			ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
 	}
-
-	rebuild();
+	else if(part.get_name()=="slider" && multiline)
+		autosize_child(*slider, part, ageom);
 }
 
 void Entry::set_text(const string &t)
@@ -108,7 +80,7 @@ void Entry::set_multiline(bool m)
 			add(*slider);
 			slider->set_step(1);
 			slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
-			reposition_slider();
+			rebuild();
 		}
 		check_view_range();
 	}
@@ -117,7 +89,7 @@ void Entry::set_multiline(bool m)
 void Entry::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, first_row, part_cache);
+		text.build(part, state, geom, first_row, part_cache);
 	else if(part.get_name()=="cursor")
 	{
 		const Graphic *graphic = part.get_graphic(state);
@@ -136,6 +108,14 @@ void Entry::rebuild_special(const Part &part)
 		bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
 		graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
 	}
+	else if(part.get_name()=="slider")
+	{
+		if(multiline)
+		{
+			reposition_child(*slider, part);
+			Widget::rebuild_special(part);
+		}
+	}
 	else
 		Widget::rebuild_special(part);
 }
@@ -146,7 +126,7 @@ void Entry::render_special(const Part &part, GL::Renderer &renderer) const
 		slider->render(renderer);
 }
 
-void Entry::key_press(unsigned key, unsigned)
+bool Entry::key_press(unsigned key, unsigned)
 {
 	got_key_press = true;
 	if(key==Input::KEY_LEFT)
@@ -191,16 +171,23 @@ void Entry::key_press(unsigned key, unsigned)
 		else
 			signal_enter.emit();
 	}
+	else
+		return false;
+
+	return true;
 }
 
-void Entry::character(wchar_t ch)
+bool Entry::character(wchar_t ch)
 {
 	if(got_key_press && ch>=' ')
 	{
 		text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
 		++edit_pos;
 		rebuild();
+		return true;
 	}
+
+	return false;
 }
 
 void Entry::focus_out()
@@ -211,8 +198,6 @@ void Entry::focus_out()
 
 void Entry::on_geometry_change()
 {
-	reposition_slider();
-
 	if(multiline)
 		check_view_range();
 }
@@ -229,8 +214,6 @@ void Entry::on_style_change()
 
 	text_part = style->get_part("text");
 
-	reposition_slider();
-
 	if(multiline)
 		check_view_range();
 }
@@ -242,28 +225,6 @@ void Entry::set_edit_position(unsigned ep)
 	rebuild();
 }
 
-void Entry::reposition_slider()
-{
-	if(!style || !slider)
-		return;
-
-	if(const Part *slider_part = style->get_part("slider"))
-	{
-		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;
-		}
-
-		slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
-		slider->set_geometry(sgeom);
-	}
-}
-
 void Entry::check_view_range()
 {
 	if(!multiline || !text_part)
@@ -294,5 +255,18 @@ void Entry::slider_value_changed(double value)
 		first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
 }
 
+
+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