Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 382105. Yet another word caret movement fix to ensure we stop at punctuation.

Browse Source
This commit is contained in:
roc+@cs.cmu.edu 2007-06-14 22:37:08 -07:00
parent 43d9085dd7
commit 5a994b469d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/generic/nsTextFrameThebes.cpp
View File

@ -4748,7 +4748,7 @@ nsTextFrame::PeekOffsetWord(PRBool aForward, PRBool aWordSelectEatSpace, PRBool
return PR_FALSE;
PRBool stopAfterPunctuation = nsTextTransformer::GetWordSelectStopAtPunctuation();
PRBool stopBeforePunctuation = stopAfterPunctuation && aIsKeyboardSelect;
PRBool stopBeforePunctuation = stopAfterPunctuation && !aIsKeyboardSelect;
PRInt32 offset = mContentOffset + (*aOffset < 0 ? mContentLength : *aOffset);
ClusterIterator cIter(this, offset, aForward ? 1 : -1);
PRBool firstCluster = PR_TRUE;
@ -4756,9 +4756,10 @@ nsTextFrame::PeekOffsetWord(PRBool aForward, PRBool aWordSelectEatSpace, PRBool
while (cIter.NextCluster()) {
if (aWordSelectEatSpace == cIter.IsWhitespace() && !*aSawBeforeType) {
*aSawBeforeType = PR_TRUE;
} else {
if (!firstCluster && ((*aSawBeforeType && cIter.HaveWordBreakBefore()) ||
(stopBeforePunctuation && cIter.IsPunctuation()))) {
} else if (*aSawBeforeType) {
if (!firstCluster &&
(cIter.IsPunctuation() ? stopBeforePunctuation
: cIter.HaveWordBreakBefore())) {
*aOffset = cIter.GetBeforeOffset() - mContentOffset;
return PR_TRUE;
}