TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved overflowable DirectEntry/PGentry caret-positioning's usability.

Browse Source
This commit is contained in:
gogg 2009-11-30 23:41:04 +00:00
parent e69b127292
commit 7418a00f76
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
panda/src/pgui/pgEntry.cxx
View File

@ -839,15 +839,40 @@ update_text() {
_current_text.set_mat(node->get_transform()); _current_text.set_mat(node->get_transform());
if (get_overflow_mode() && _num_lines == 1){ if (get_overflow_mode() && _num_lines == 1){
float padding = (_text.get_xpos(0, _cursor_position) - _max_width); // We determine the minimum required padding:
if (padding < 0){ float cursor_graphic_pos = _text.get_xpos(0, _cursor_position);
padding = 0; float min_padding = (cursor_graphic_pos - _max_width);
}
_current_text.set_x(_current_text.get_x() - padding); // If the current padding would produce a caret outside the text entry,
_current_text.set_scissor(NodePath(this), // we relocate it.
LPoint3f(0, 0, -0.5), LPoint3f(_max_width, 0, -0.5), // Here we also have to make a jump towards the center when the caret
LPoint3f(_max_width, 0, 1.5), LPoint3f(0, 0, 1.5)); // is going outside the visual area and there's enough text ahead for
_current_padding = padding; // increased usability.
//
// The amount that the caret is moved for hinting depends on the OS,
// and the specific behavior under certain circunstances in different
// Operating Systems is very complicated (the implementation would need
// to "remember" the original typing starting point). For the moment we are
// gonna use an unconditional 50% jump, this behavior is found in some
// Mac dialogs, and it's the easiest to implement by far, while
// providing proven usability.
// PROS: Reduces the amount of scrolling while both writing and navigating
// with arrow keys, which is desirable.
// CONS: The user needs to remember that he/she has exceeded the boundaries,
// but this happens with all implementations to some degree.
if (_current_padding < min_padding || _current_padding > cursor_graphic_pos){
_current_padding = min_padding + (cursor_graphic_pos - min_padding) * 0.5;
}
if (_current_padding < 0){ // Caret virtual position doesn't exceed boundaries
_current_padding = 0;
}
_current_text.set_x(_current_text.get_x() - _current_padding);
_current_text.set_scissor(NodePath(this),
LPoint3f(0, 0, -0.5), LPoint3f(_max_width, 0, -0.5),
LPoint3f(_max_width, 0, 1.5), LPoint3f(0, 0, 1.5));
} }
_text_geom_stale = false; _text_geom_stale = false;