X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=a635101404423e9b64524ad7dfee6b9471b53c24;hb=319cde3c06181ba1c3619567525002926d8b4889;hp=a554dbbaf2153135be94f869aebc43fe01f7f862;hpb=4f4a17099ee8e927b55fb80c7eaf18a0b4b595db;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index a554dbb..a635101 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -1,13 +1,6 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2007-2011 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include +#include #include -#include #include #include "entry.h" #include "graphic.h" @@ -23,11 +16,14 @@ 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); } @@ -42,15 +38,15 @@ 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(font.get_string_width("n")*font.get_native_size()); - geom.w = max(geom.w, 10*en_width+margin.left+margin.right); + const GL::Font &font = style->get_font(); + unsigned en_width = static_cast(font.get_string_width("n")*style->get_font_size()); + geom.w = max(geom.w, edit_width*en_width+margin.left+margin.right); - unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*font.get_native_size()); + unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*style->get_font_size()); if(multiline) { - unsigned line_spacing = font.get_native_size()*6/5; - geom.h = max(geom.h, line_height+line_spacing*2+margin.top+margin.bottom); + 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); } else geom.h = max(geom.h, line_height+margin.top+margin.bottom); @@ -79,6 +75,8 @@ void Entry::autosize() check_view_range(); } + + rebuild(); } void Entry::set_text(const string &t) @@ -88,6 +86,15 @@ void Entry::set_text(const string &t) if(multiline) check_view_range(); + + 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) @@ -107,13 +114,14 @@ void Entry::set_multiline(bool m) } } -void Entry::render_special(const Part &part) const +void Entry::rebuild_special(const Part &part) { if(part.get_name()=="text") - text.render(part, geom, first_row); + text.build(part, geom, first_row, part_cache); else if(part.get_name()=="cursor") { - if(!text_part || !part.get_graphic(state)) + const Graphic *graphic = part.get_graphic(state); + if(!text_part || !graphic || !graphic->get_texture()) return; unsigned row, col; @@ -124,51 +132,44 @@ void Entry::render_special(const Part &part) const Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); - GL::push_matrix(); - GL::translate(rgeom.x, rgeom.y, 0); - part.get_graphic(state)->render(part.get_geometry().w, part.get_geometry().h); - GL::pop_matrix(); + 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 if(part.get_name()=="slider" && multiline) - slider->render(); + else + Widget::rebuild_special(part); +} + +void Entry::render_special(const Part &part, GL::Renderer &renderer) const +{ + if(part.get_name()=="slider" && multiline) + slider->render(renderer); } -void Entry::key_press(unsigned key, unsigned, wchar_t ch) +void Entry::key_press(unsigned key, unsigned) { + got_key_press = true; if(key==Input::KEY_LEFT) { if(edit_pos>0) - { - --edit_pos; - check_view_range(); - } + set_edit_position(edit_pos-1); } else if(key==Input::KEY_RIGHT) { if(edit_pos0) - { - edit_pos = text.coords_to_offset(row-1, col); - check_view_range(); - } - else - edit_pos = 0; + set_edit_position(row>0 ? text.coords_to_offset(row-1, col) : 0); } else if(key==Input::KEY_BACKSPACE) { @@ -176,6 +177,7 @@ void Entry::key_press(unsigned key, unsigned, wchar_t ch) { text.erase(--edit_pos, 1); check_view_range(); + rebuild(); } } else if(key==Input::KEY_ENTER) @@ -184,17 +186,29 @@ void Entry::key_press(unsigned key, unsigned, wchar_t ch) { text.insert(edit_pos++, "\n"); check_view_range(); + rebuild(); } else signal_enter.emit(); } - else if(ch>=' ') +} + +void Entry::character(wchar_t ch) +{ + if(got_key_press && ch>=' ') { - text.insert(edit_pos, Codecs::encode(Codecs::ustring(1, ch))); + text.insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); ++edit_pos; + rebuild(); } } +void Entry::focus_out() +{ + Widget::focus_out(); + got_key_press = false; +} + void Entry::on_geometry_change() { reposition_slider(); @@ -221,6 +235,13 @@ void Entry::on_style_change() check_view_range(); } +void Entry::set_edit_position(unsigned ep) +{ + edit_pos = ep; + check_view_range(); + rebuild(); +} + void Entry::reposition_slider() { if(!style || !slider) @@ -248,8 +269,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(font_size*6/5); const Sides &margin = text_part->get_margin(); @@ -274,10 +294,5 @@ void Entry::slider_value_changed(double value) first_row = text.get_n_lines()-visible_rows-static_cast(value); } - -Entry::Loader::Loader(Entry &ent): - Widget::Loader(ent) -{ } - } // namespace GLtk } // namespace Msp