i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* introduced two new private methods, _PreviousWordStart() and _NextWordStart(),

Browse Source 
which are now being used to implement the word-wise keyboard navigation,
  fixing #4785


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33885 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2009-11-04 18:49:15 +00:00
parent 3b02662f2d
commit a85a827cd0
2 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TextView.cpp
+55 -2
View File
@@ -3289,7 +3289,7 @@ BTextView::_HandleArrowKey(uint32 inArrowKey)
else {
fCaretOffset
= ctrlDown
? _PreviousWordBoundary(fCaretOffset - 1)
? _PreviousWordStart(fCaretOffset - 1)
: _PreviousInitialByte(fCaretOffset);
if (shiftDown && fCaretOffset != lastClickOffset) {
if (fCaretOffset < fSelStart) {
@@ -3315,7 +3315,7 @@ BTextView::_HandleArrowKey(uint32 inArrowKey)
else {
fCaretOffset
= ctrlDown
? _NextWordBoundary(fCaretOffset)
? _NextWordStart(fCaretOffset)
: _NextInitialByte(fCaretOffset);
if (shiftDown && fCaretOffset != lastClickOffset) {
if (fCaretOffset > fSelEnd) {
@@ -4061,6 +4061,59 @@ BTextView::_NextWordBoundary(int32 offset)
}
int32
BTextView::_PreviousWordStart(int32 offset)
{
if (offset <= 1)
return 0;
--offset; // need to look at previous char
if (_CharClassification(offset) == CHAR_CLASS_WHITESPACE) {
// skip whitespace
while (offset > 0) {
offset = _PreviousInitialByte(offset);
if (_CharClassification(offset) != CHAR_CLASS_WHITESPACE)
break;
}
}
while (offset > 0) {
// find preceeding whitespace char.
int32 previous = _PreviousInitialByte(offset);
if (_CharClassification(previous) == CHAR_CLASS_WHITESPACE)
break;
offset = previous;
}
return offset;
}
int32
BTextView::_NextWordStart(int32 offset)
{
int32 textLen = TextLength();
if (offset >= textLen)
return textLen;
if (_CharClassification(offset) != CHAR_CLASS_WHITESPACE) {
// skip until the next whitespace
while (offset < textLen) {
offset = _NextInitialByte(offset);
if (_CharClassification(offset) == CHAR_CLASS_WHITESPACE)
break;
}
}
while (offset < textLen) {
// find next non-white char
offset = _NextInitialByte(offset);
if (_CharClassification(offset) != CHAR_CLASS_WHITESPACE)
break;
}
return offset;
}
/*! \brief Returns the width used by the characters starting at the given
offset with the given length, expanding all tab characters as needed.
*/