X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=a0df8cb9e423c1372c56997be5cf1ba74db50c9b;hb=4ab33a06c9f8a85b193d7db8bc6ee9b8895aab09;hp=2dc046646e49af2af9b07967a090e42f041f0c64;hpb=43ac7c4514658754d09552463425bcd344fb9ded;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 2dc0466..a0df8cb 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>
@@ -42,14 +35,14 @@ void Entry::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")*font.get_native_size());
+		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())*font.get_native_size());
+		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
 		if(multiline)
 		{
-			unsigned line_spacing = font.get_native_size()*6/5;
+			unsigned line_spacing = style->get_font_size()*6/5;
 			geom.h = max(geom.h, line_height+line_spacing*2+margin.top+margin.bottom);
 		}
 		else
@@ -129,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)
 	{
@@ -188,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;
 	}
 }
@@ -248,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();
@@ -263,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)