Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-31 21:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 313602: Bidi: Caret appears incorrectly when using up/down arrows to move into a blank line surrounded by reverse-direction text. Patch by Uri Bernstein <uriber@gmail.com, r=smontagu, sr=roc

Browse Source
This commit is contained in:
smontagu%smontagu.org 2005-11-16 09:40:52 +00:00
parent 69f04748e6
commit 75f5688bba
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
layout/generic/nsSelection.cpp
View File

@ -1437,34 +1437,31 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinueSelection, nsSelection
theFrame->GetOffsets(frameStart, frameEnd);
tHint = (HINT)pos.mPreferLeft;
if (frameStart !=0 || frameEnd !=0) // Otherwise the frame is not a text frame, so nothing more to do
{
switch (aKeycode) {
case nsIDOMKeyEvent::DOM_VK_HOME:
case nsIDOMKeyEvent::DOM_VK_END:
switch (aKeycode) {
case nsIDOMKeyEvent::DOM_VK_HOME:
case nsIDOMKeyEvent::DOM_VK_END:
// force the offset to the logical beginning (for HOME) or end (for END) of the frame
// (if it is an RTL frame it will be at the visual beginning or end, which we don't want in this case)
if (nsIDOMKeyEvent::DOM_VK_HOME == aKeycode)
pos.mContentOffset = frameStart;
else
pos.mContentOffset = frameEnd;
// force the offset to the logical beginning (for HOME) or end (for END) of the frame
// (if it is an RTL frame it will be at the visual beginning or end, which we don't want in this case)
if (nsIDOMKeyEvent::DOM_VK_HOME == aKeycode)
pos.mContentOffset = frameStart;
else
pos.mContentOffset = frameEnd;
// set the cursor Bidi level to the paragraph embedding level
mShell->SetCaretBidiLevel(NS_GET_BASE_LEVEL(theFrame));
break;
// set the cursor Bidi level to the paragraph embedding level
mShell->SetCaretBidiLevel(NS_GET_BASE_LEVEL(theFrame));
break;
default:
// If the current position is not a frame boundary, it's enough just to take the Bidi level of the current frame
if ((pos.mContentOffset != frameStart && pos.mContentOffset != frameEnd)
|| (eSelectDir == aAmount)
|| (eSelectLine == aAmount))
{
mShell->SetCaretBidiLevel(NS_GET_EMBEDDING_LEVEL(theFrame));
}
else
BidiLevelFromMove(context, mShell, pos.mResultContent, pos.mContentOffset, aKeycode, tHint);
}
default:
// If the current position is not a frame boundary, it's enough just to take the Bidi level of the current frame
if ((pos.mContentOffset != frameStart && pos.mContentOffset != frameEnd)
|| (eSelectDir == aAmount)
|| (eSelectLine == aAmount))
{
mShell->SetCaretBidiLevel(NS_GET_EMBEDDING_LEVEL(theFrame));
}
else
BidiLevelFromMove(context, mShell, pos.mResultContent, pos.mContentOffset, aKeycode, tHint);
}
#ifdef VISUALSELECTION
// Handle visual selection