X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=261cf8b938dd88f5d0adeb1eb64b682a66458759;hb=11d1b67a9180a0e468b56e355fbe0c88d104ef72;hp=271c49a4b6cda21ca063f9e7e7339ea460c96de5;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 271c49a..261cf8b 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/matrix.h>
 #include <msp/gl/texture.h>
 #include <msp/gl/transform.h>
@@ -32,6 +25,55 @@ Entry::Entry(const string &t):
 	set_text(t);
 }
 
+void Entry::autosize()
+{
+	if(!style)
+		return;
+
+	Widget::autosize();
+
+	if(text_part)
+	{
+		const Sides &margin = text_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);
+
+		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);
+		}
+		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();
+	}
+}
+
 void Entry::set_text(const string &t)
 {
 	text = t;
@@ -80,11 +122,11 @@ void Entry::render_special(const Part &part) const
 		part.get_graphic(state)->render(part.get_geometry().w, part.get_geometry().h);
 		GL::pop_matrix();
 	}
-	else if(part.get_name()=="slider")
+	else if(part.get_name()=="slider" && multiline)
 		slider->render();
 }
 
-void Entry::key_press(unsigned key, unsigned, wchar_t ch)
+void Entry::key_press(unsigned key, unsigned)
 {
 	if(key==Input::KEY_LEFT)
 	{
@@ -139,9 +181,13 @@ void Entry::key_press(unsigned key, unsigned, wchar_t ch)
 		else
 			signal_enter.emit();
 	}
-	else if(ch>=' ')
+}
+
+void Entry::character(wchar_t ch)
+{
+	if(ch>=' ')
 	{
-		text.insert(edit_pos, Codecs::encode<Codecs::Utf8>(Codecs::ustring(1, ch)));
+		text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
 		++edit_pos;
 	}
 }
@@ -180,6 +226,15 @@ void Entry::reposition_slider()
 	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);
 	}
@@ -190,8 +245,7 @@ void Entry::check_view_range()
 	if(!multiline || !text_part)
 		return;
 
-	const GL::Font *font = style->get_font();
-	float font_size = font->get_default_size();
+	float font_size = style->get_font_size();
 	unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
 
 	const Sides &margin = text_part->get_margin();
@@ -205,12 +259,9 @@ void Entry::check_view_range()
 	else if(row>=first_row+visible_rows)
 		first_row = row+1-visible_rows;
 
-	if(slider)
-	{
-		unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
-		slider->set_range(0, scroll);
-		slider->set_value(scroll-first_row);
-	}
+	unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
+	slider->set_range(0, scroll);
+	slider->set_value(scroll-first_row);
 }
 
 void Entry::slider_value_changed(double value)