]> git.tdb.fi Git - libs/gltk.git/blobdiff - source/entry.cpp
Make font size a property of Style
[libs/gltk.git] / source / entry.cpp
index ec6bba702983081fa0de856911da0484a3b50953..261cf8b938dd88f5d0adeb1eb64b682a66458759 100644 (file)
@@ -36,13 +36,13 @@ void Entry::autosize()
        {
                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());
+               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
@@ -126,7 +126,7 @@ void Entry::render_special(const Part &part) const
                slider->render();
 }
 
-void Entry::key_press(unsigned key, unsigned, wchar_t ch)
+void Entry::key_press(unsigned key, unsigned)
 {
        if(key==Input::KEY_LEFT)
        {
@@ -181,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;
        }
 }
@@ -241,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();