Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent the right-to-left directional hook from overlapping the caret and make both directions thinner. Bug 264903, r=mkaply, aaronleventhal, sr=rbs.

Browse Source
This commit is contained in:
smontagu%smontagu.org 2004-11-30 19:28:00 +00:00
parent c21915db9d
commit 52ff1c323f
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/base/nsCaret.cpp
View File

@ -1036,10 +1036,10 @@ void nsCaret::GetCaretRectAndInvert()
// Simon -- make a hook to draw to the left or right of the caret to show keyboard language direction
PRBool bidiEnabled;
nsRect hookRect;
PRBool bidiLevel=PR_FALSE;
PRBool isCaretRTL=PR_FALSE;
if (mBidiKeyboard)
mBidiKeyboard->IsLangRTL(&bidiLevel);
if (bidiLevel)
mBidiKeyboard->IsLangRTL(&isCaretRTL);
if (isCaretRTL)
{
bidiEnabled = PR_TRUE;
presContext->SetBidiEnabled(bidiEnabled);
@ -1048,7 +1048,7 @@ void nsCaret::GetCaretRectAndInvert()
bidiEnabled = presContext->BidiEnabled();
if (bidiEnabled)
{
if (bidiLevel != mKeyboardRTL)
if (isCaretRTL != mKeyboardRTL)
{
/* if the caret bidi level and the keyboard language direction are not in
* synch, the keyboard language must have been changed by the
@ -1058,7 +1058,7 @@ void nsCaret::GetCaretRectAndInvert()
* appear. We will call |SelectionLanguageChange| and exit
* without drawing the caret in the old position.
*/
mKeyboardRTL = bidiLevel;
mKeyboardRTL = isCaretRTL;
nsCOMPtr<nsISelection> domSelection = do_QueryReferent(mDomSelectionWeak);
if (domSelection)
{
@ -1070,9 +1070,14 @@ void nsCaret::GetCaretRectAndInvert()
}
}
// If keyboard language is RTL, draw the hook on the left; if LTR, to the right
hookRect.SetRect(caretRect.x + caretRect.width * ((bidiLevel) ? -1 : 1),
// The height of the hook rectangle is the same as the width of the caret
// rectangle.
hookRect.SetRect(caretRect.x + ((isCaretRTL) ?
mBidiIndicatorTwipsSize * -1 :
caretRect.width),
caretRect.y + mBidiIndicatorTwipsSize,
mBidiIndicatorTwipsSize, mBidiIndicatorTwipsSize);
mBidiIndicatorTwipsSize,
caretRect.width);
mHookRect.IntersectRect(clipRect, hookRect);
}
#endif //IBMBIDI

19
layout/base/src/nsCaret.cpp
View File

@ -1036,10 +1036,10 @@ void nsCaret::GetCaretRectAndInvert()
// Simon -- make a hook to draw to the left or right of the caret to show keyboard language direction
PRBool bidiEnabled;
nsRect hookRect;
PRBool bidiLevel=PR_FALSE;
PRBool isCaretRTL=PR_FALSE;
if (mBidiKeyboard)
mBidiKeyboard->IsLangRTL(&bidiLevel);
if (bidiLevel)
mBidiKeyboard->IsLangRTL(&isCaretRTL);
if (isCaretRTL)
{
bidiEnabled = PR_TRUE;
presContext->SetBidiEnabled(bidiEnabled);
@ -1048,7 +1048,7 @@ void nsCaret::GetCaretRectAndInvert()
bidiEnabled = presContext->BidiEnabled();
if (bidiEnabled)
{
if (bidiLevel != mKeyboardRTL)
if (isCaretRTL != mKeyboardRTL)
{
/* if the caret bidi level and the keyboard language direction are not in
* synch, the keyboard language must have been changed by the
@ -1058,7 +1058,7 @@ void nsCaret::GetCaretRectAndInvert()
* appear. We will call |SelectionLanguageChange| and exit
* without drawing the caret in the old position.
*/
mKeyboardRTL = bidiLevel;
mKeyboardRTL = isCaretRTL;
nsCOMPtr<nsISelection> domSelection = do_QueryReferent(mDomSelectionWeak);
if (domSelection)
{
@ -1070,9 +1070,14 @@ void nsCaret::GetCaretRectAndInvert()
}
}
// If keyboard language is RTL, draw the hook on the left; if LTR, to the right
hookRect.SetRect(caretRect.x + caretRect.width * ((bidiLevel) ? -1 : 1),
// The height of the hook rectangle is the same as the width of the caret
// rectangle.
hookRect.SetRect(caretRect.x + ((isCaretRTL) ?
mBidiIndicatorTwipsSize * -1 :
caretRect.width),
caretRect.y + mBidiIndicatorTwipsSize,
mBidiIndicatorTwipsSize, mBidiIndicatorTwipsSize);
mBidiIndicatorTwipsSize,
caretRect.width);
mHookRect.IntersectRect(clipRect, hookRect);
}
#endif //IBMBIDI