X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=8d3c47f82331ab5e3eb643b3e8af0f2941268b72;hb=46def086def19c58fb9e577312c07f2f7e758b34;hp=8aee0cf4962ee3ed6a4994a045c622a4631d153a;hpb=022c6ccec48b5dca482239da4a4c38550377b188;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index 8aee0cf..8d3c47f 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -16,6 +16,8 @@ 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), @@ -23,58 +25,30 @@ Entry::Entry(const string &t): slider(0), got_key_press(false) { + input_type = INPUT_TEXT; set_text(t); } -void Entry::autosize() +void Entry::autosize_special(const Part &part, Geometry &ageom) const { - if(!style) - return; - - Widget::autosize(); - - if(text_part) + if(part.get_name()=="text") { - const Sides &margin = text_part->get_margin(); + 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()); - geom.w = max(geom.w, 10*en_width+margin.left+margin.right); + 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; - geom.h = max(geom.h, line_height+line_spacing*2+margin.top+margin.bottom); + ageom.h = max(ageom.h, line_height+line_spacing*(edit_height-1)+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(); + ageom.h = max(ageom.h, line_height+margin.top+margin.bottom); } - - rebuild(); + else if(part.get_name()=="slider" && multiline) + autosize_child(*slider, part, ageom); } void Entry::set_text(const string &t) @@ -88,6 +62,13 @@ void Entry::set_text(const string &t) 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) { multiline = m; @@ -99,43 +80,44 @@ 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::rebuild_special(const Part &part, CachedPart &cache) +void Entry::rebuild_special(const Part &part) { if(part.get_name()=="text") - text.build(part, geom, first_row, cache); + text.build(part, state, geom, first_row, part_cache); else if(part.get_name()=="cursor") { const Graphic *graphic = part.get_graphic(state); - if(!text_part || !graphic) - { - cache.texture = 0; + 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) - { - cache.texture = 0; return; - } Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); - cache.texture = graphic->get_texture(); - cache.clear_mesh(); - - GL::MeshBuilder bld(*cache.mesh); + 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) + { + reposition_child(*slider, part); + Widget::rebuild_special(part); + } + } + else + Widget::rebuild_special(part); } void Entry::render_special(const Part &part, GL::Renderer &renderer) const @@ -144,32 +126,17 @@ void Entry::render_special(const Part &part, GL::Renderer &renderer) const slider->render(renderer); } -void Entry::key_press(unsigned key, unsigned) +void Entry::touch_press(int x, int y, unsigned finger) +{ + if(finger==0) + set_focus(); + Widget::touch_press(x, y, finger); +} + +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 ? text.coords_to_offset(row-1, col) : 0); - } - else if(key==Input::KEY_BACKSPACE) + if(key==Input::KEY_BACKSPACE) { if(edit_pos>0) { @@ -178,27 +145,29 @@ void Entry::key_press(unsigned key, unsigned) rebuild(); } } - else if(key==Input::KEY_ENTER) + else if(key==Input::KEY_ENTER && multiline) { - if(multiline) - { - text.insert(edit_pos++, "\n"); - check_view_range(); - rebuild(); - } - else - signal_enter.emit(); + text.insert(edit_pos++, "\n"); + check_view_range(); + rebuild(); } + else + return false; + + return true; } -void Entry::character(wchar_t ch) +bool Entry::character(wchar_t ch) { if(got_key_press && ch>=' ') { text.insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); ++edit_pos; rebuild(); + return true; } + + return false; } void Entry::focus_out() @@ -207,10 +176,40 @@ void Entry::focus_out() got_key_press = false; } -void Entry::on_geometry_change() +bool Entry::navigate(Navigation nav) { - reposition_slider(); + if(nav==NAV_LEFT) + { + if(edit_pos>0) + set_edit_position(edit_pos-1); + } + else if(nav==NAV_RIGHT) + { + if(edit_pos0 ? text.coords_to_offset(row-1, col) : 0); + } + else if(nav==NAV_ACCEPT && !signal_enter.empty()) + signal_enter.emit(); + else + return false; + + return true; +} +void Entry::on_geometry_change() +{ if(multiline) check_view_range(); } @@ -227,8 +226,6 @@ void Entry::on_style_change() text_part = style->get_part("text"); - reposition_slider(); - if(multiline) check_view_range(); } @@ -240,28 +237,6 @@ void Entry::set_edit_position(unsigned ep) rebuild(); } -void Entry::reposition_slider() -{ - if(!style || !slider) - return; - - 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); - } -} - void Entry::check_view_range() { if(!multiline || !text_part) @@ -293,9 +268,17 @@ void Entry::slider_value_changed(double 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