From 80f773ac31b3666026df9488e789242501cf40fb Mon Sep 17 00:00:00 2001 From: "ftang%netscape.com" Date: Mon, 25 Oct 1999 22:18:41 +0000 Subject: [PATCH] fix not enough gap between IME selection problem. r=erik git-svn-id: svn://10.0.0.236/trunk@51752 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsTextFrame.cpp | 8 ++++---- mozilla/layout/html/base/src/nsTextFrame.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 4270c720354..e5e7f056bc8 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -1137,12 +1137,12 @@ nsTextFrame::PaintTextDecorations(nsIRenderingContext& aRenderingContext, #endif aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset+size, textWidth-2, size); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset+size, textWidth-2*size, size); }break; case SELECTION_IME_RAWINPUT:{ aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset+size, textWidth-2, size); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset+size, textWidth-2*size, size); }break; case SELECTION_IME_SELECTEDCONVERTEDTEXT:{ #ifdef USE_INVERT_FOR_SELECTION @@ -1154,12 +1154,12 @@ nsTextFrame::PaintTextDecorations(nsIRenderingContext& aRenderingContext, #endif aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset, textWidth-2, size*2); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset, textWidth-2*size, size*2); }break; case SELECTION_IME_CONVERTEDTEXT:{ aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset, textWidth-2, size*2); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset, textWidth-2*size, size*2); }break; default: NS_ASSERTION(0,"what type of selection do i not know about?"); diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 4270c720354..e5e7f056bc8 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -1137,12 +1137,12 @@ nsTextFrame::PaintTextDecorations(nsIRenderingContext& aRenderingContext, #endif aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset+size, textWidth-2, size); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset+size, textWidth-2*size, size); }break; case SELECTION_IME_RAWINPUT:{ aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset+size, textWidth-2, size); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset+size, textWidth-2*size, size); }break; case SELECTION_IME_SELECTEDCONVERTEDTEXT:{ #ifdef USE_INVERT_FOR_SELECTION @@ -1154,12 +1154,12 @@ nsTextFrame::PaintTextDecorations(nsIRenderingContext& aRenderingContext, #endif aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset, textWidth-2, size*2); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset, textWidth-2*size, size*2); }break; case SELECTION_IME_CONVERTEDTEXT:{ aTextStyle.mNormalFont->GetUnderline(offset, size); aRenderingContext.SetColor(NS_RGB(189,33,66)); - aRenderingContext.FillRect(aX + startOffset+1, aY + baseline - offset, textWidth-2, size*2); + aRenderingContext.FillRect(aX + startOffset+size, aY + baseline - offset, textWidth-2*size, size*2); }break; default: NS_ASSERTION(0,"what type of selection do i not know about?");