X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=43dad5e7de46dbcb69569427c083352eee0aabac;hb=6d73e04329fc3752552773e4d11d7374caf779f6;hp=2c9cb357fa55d38215c64358b4f1ae22fe972932;hpb=91997dd3189b93a67179822ec2fed5f2a7bddb74;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index 2c9cb35..43dad5e 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -1,13 +1,6 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include +#include #include -#include #include #include "entry.h" #include "graphic.h" @@ -23,15 +16,40 @@ 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); } +void Entry::autosize_special(const Part &part, Geometry &ageom) const +{ + if(part.get_name()=="text") + { + const Sides &margin = part.get_margin(); + const GL::Font &font = style->get_font(); + unsigned en_width = static_cast(font.get_string_width("n")*style->get_font_size()); + ageom.w = max(ageom.w, edit_width*en_width+margin.left+margin.right); + + unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*style->get_font_size()); + if(multiline) + { + unsigned line_spacing = style->get_font_size()*6/5; + ageom.h = max(ageom.h, line_height+line_spacing*(edit_height-1)+margin.top+margin.bottom); + } + else + ageom.h = max(ageom.h, line_height+margin.top+margin.bottom); + } + else if(part.get_name()=="slider" && multiline) + autosize_child(*slider, part, ageom); +} + void Entry::set_text(const string &t) { text = t; @@ -39,6 +57,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) @@ -52,48 +79,76 @@ 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(); } } -void Entry::key_press(unsigned key, unsigned, wchar_t ch) +void Entry::rebuild_special(const Part &part) { - if(key==Input::KEY_LEFT) + if(part.get_name()=="text") + text.build(part, state, geom, first_row, part_cache); + else if(part.get_name()=="cursor") { - if(edit_pos>0) + const Graphic *graphic = part.get_graphic(state); + if(!text_part || !graphic || !graphic->get_texture()) + return; + + unsigned row, col; + text.offset_to_coords(edit_pos, row, col); + + if(row=first_row+visible_rows) + return; + + Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); + + 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") + { + if(multiline) { - --edit_pos; - check_view_range(); + reposition_child(*slider, part); + Widget::rebuild_special(part); } } + 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); +} + +bool Entry::key_press(unsigned key, unsigned) +{ + got_key_press = true; + if(key==Input::KEY_LEFT) + { + if(edit_pos>0) + 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) { @@ -101,6 +156,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) @@ -109,47 +165,38 @@ 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>=' ') - { - text.insert(edit_pos, Codecs::encode(Codecs::ustring(1, ch))); - ++edit_pos; - } + else + return false; + + return true; } -void Entry::render_special(const Part &part) const +bool Entry::character(wchar_t ch) { - if(part.get_name()=="text") - text.render(part, geom, first_row); - else if(part.get_name()=="cursor") + if(got_key_press && ch>=' ') { - if(!text_part || !part.get_graphic(state)) - return; - - unsigned row, col; - text.offset_to_coords(edit_pos, row, col); - - if(row=first_row+visible_rows) - return; + text.insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); + ++edit_pos; + rebuild(); + return true; + } - Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); + return false; +} - 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(); - } - else if(part.get_name()=="slider") - slider->render(); +void Entry::focus_out() +{ + Widget::focus_out(); + got_key_press = false; } void Entry::on_geometry_change() { - reposition_slider(); - if(multiline) check_view_range(); } @@ -166,29 +213,15 @@ void Entry::on_style_change() text_part = style->get_part("text"); - reposition_slider(); - if(multiline) check_view_range(); } -void Entry::reposition_slider() -{ - if(!style || !slider) - return; - - if(const Part *slider_part = style->get_part("slider")) - { - Geometry sgeom = slider_part->get_geometry(); - slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin()); - slider->set_geometry(sgeom); - } -} - -void Entry::slider_value_changed(double value) +void Entry::set_edit_position(unsigned ep) { - if(text.get_n_lines()>visible_rows) - first_row = text.get_n_lines()-visible_rows-static_cast(value); + edit_pos = ep; + check_view_range(); + rebuild(); } void Entry::check_view_range() @@ -196,8 +229,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(); @@ -211,18 +243,29 @@ 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) +{ + if(text.get_n_lines()>visible_rows) + first_row = text.get_n_lines()-visible_rows-static_cast(value); } -Entry::Loader::Loader(Entry &ent): - Widget::Loader(ent) -{ } +Entry::Loader::Loader(Entry &e): + DataFile::DerivedObjectLoader(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