first_row(0),
visible_rows(1),
text_part(0),
- slider(0)
+ slider(0),
+ got_key_press(false)
{
set_text(t);
}
text.build(part, geom, first_row, 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)
{
cache.texture = 0;
return;
Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col);
- cache.texture = part.get_graphic(state)->get_texture();
+ cache.texture = graphic->get_texture();
cache.clear_mesh();
GL::MeshBuilder bld(*cache.mesh);
bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
- part.get_graphic(state)->build(part.get_geometry().w, part.get_geometry().h, bld);
+ graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
}
}
-void Entry::render_special(const Part &part) const
+void Entry::render_special(const Part &part, GL::Renderer &renderer) const
{
if(part.get_name()=="slider" && multiline)
- slider->render();
+ slider->render(renderer);
}
void Entry::key_press(unsigned key, unsigned)
{
+ got_key_press = true;
if(key==Input::KEY_LEFT)
{
if(edit_pos>0)
void Entry::character(wchar_t ch)
{
- if(ch>=' ')
+ if(got_key_press && ch>=' ')
{
text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
++edit_pos;
}
}
+void Entry::focus_out()
+{
+ Widget::focus_out();
+ got_key_press = false;
+}
+
void Entry::on_geometry_change()
{
reposition_slider();