namespace Msp {
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),
- got_key_press(false),
- cursor_blink(true),
- selection_active(false),
- selection_pos(0)
+Entry::Entry(const string &t)
{
input_type = INPUT_TEXT;
set_text(t);
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);
+ bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
}
else if(part.get_name()=="selection")
Geometry egeom = text.coords_to_geometry(*text_part, geom, first_row, row, ec);
GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
- bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+ bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
graphic->build(egeom.x-rgeom.x, part.get_geometry().h, bld);
}
{
if(nav==NAV_LEFT || nav==NAV_RIGHT || ((nav==NAV_DOWN || nav==NAV_UP) && multiline))
move_edit_position(nav, false);
- else if(nav==NAV_ACCEPT && !signal_enter.empty())
- signal_enter.emit();
else
return false;
if(!style)
{
- text_part = 0;
+ text_part = nullptr;
return;
}
- text_part = style->get_part("text");
+ text_part = style->find_part("text");
if(multiline)
check_view_range();
void Entry::adjust_edit_position_for_change(unsigned pos, int change)
{
unsigned old_edit_pos = edit_pos;
+ unsigned old_select_pos = selection_pos;
if(change>0)
{
{
if(edit_pos>=pos)
edit_pos -= min<unsigned>(edit_pos-pos, -change);
- if(selection_active)
+ if(selection_active && selection_pos>=pos)
selection_pos -= min<unsigned>(selection_pos-pos, -change);
}
if(edit_pos!=old_edit_pos)
signal_edit_position_changed.emit(edit_pos);
+ if(selection_active && (edit_pos!=old_edit_pos || selection_pos!=old_select_pos))
+ {
+ unsigned start, end;
+ if(get_selection(start, end))
+ signal_selection_changed.emit(start, end);
+ }
}
void Entry::set_edit_position(unsigned ep, bool select)
{
+ bool selection_was_active = selection_active;
if(select && !selection_active)
selection_pos = edit_pos;
selection_active = select;
edit_pos = min(ep, text.size());
if(edit_pos!=old_edit_pos)
+ {
signal_edit_position_changed.emit(edit_pos);
+ unsigned start, end;
+ if(get_selection(start, end))
+ signal_selection_changed.emit(start, end);
+ else if(selection_was_active)
+ signal_selection_changed.emit(edit_pos, edit_pos);
+ }
if(multiline)
check_view_range();
void Entry::check_cursor_blink()
{
- const Part *cursor_part = style->get_part("cursor");
+ const Part *cursor_part = style->find_part("cursor");
bool has_blink = (cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS));
cursor_blink = (state&FOCUS);
if(!multiline || !text_part)
return;
- visible_rows = text.get_visible_lines(*text_part, geom, 0);
+ visible_rows = text.get_visible_lines(*text_part, geom, nullptr);
unsigned row, col;
text.offset_to_coords(edit_pos, row, col);