Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#ifdef tbe blue selection triangles in until the caret code is turned on

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@20476 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com 1999-02-12 00:05:19 +00:00
parent 5087b40527
commit b4a259e54f
2 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mozilla/layout/generic/nsTextFrame.cpp
View File

@ -687,6 +687,11 @@ TextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
return numSpaces;
}
#define SHOW_SELECTION_CURSOR // should be turned off when the caret code is activated
#ifdef SHOW_SELECTION_CURSOR
// XXX This clearly needs to be done by the container, *somehow*
#define CURSOR_COLOR NS_RGB(0,0,255)
static void
@ -713,6 +718,8 @@ RenderSelectionCursor(nsIRenderingContext& aRenderingContext,
aRenderingContext.FillPolygon(pnts, 4);
}
#endif
// XXX letter-spacing
// XXX word-spacing
@ -848,10 +855,13 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext,
PaintTextDecorations(aRenderingContext, aStyleContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
//aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
//RenderSelectionCursor(aRenderingContext,
// dx + textWidth, dy, mRect.height,
// CURSOR_COLOR);
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
#ifdef SHOW_SELECTION_CURSOR
RenderSelectionCursor(aRenderingContext,
dx + textWidth, dy, mRect.height,
CURSOR_COLOR);
#endif
}
else
{
@ -1175,11 +1185,14 @@ TextFrame::PaintTextSlowly(nsIPresContext& aPresContext,
if (si.mEmptySelection) {
RenderString(aRenderingContext, aStyleContext, aTextStyle,
text, textLength, dx, dy, width);
//GetWidth(aRenderingContext, aTextStyle,
// text, PRUint32(si.mStartOffset), textWidth);
//RenderSelectionCursor(aRenderingContext,
// dx + textWidth, dy, mRect.height,
// CURSOR_COLOR);
#ifdef SHOW_SELECTION_CURSOR
GetWidth(aRenderingContext, aTextStyle,
text, PRUint32(si.mStartOffset), textWidth);
RenderSelectionCursor(aRenderingContext,
dx + textWidth, dy, mRect.height,
CURSOR_COLOR);
#endif
}
else {
nscoord x = dx;
@ -1318,10 +1331,12 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
PaintTextDecorations(aRenderingContext, aStyleContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
//aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
//RenderSelectionCursor(aRenderingContext,
// dx + textWidth, dy, mRect.height,
// CURSOR_COLOR);
#ifdef SHOW_SELECTION_CURSOR
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
RenderSelectionCursor(aRenderingContext,
dx + textWidth, dy, mRect.height,
CURSOR_COLOR);
#endif
}
else
{

41
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@ -687,6 +687,11 @@ TextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
return numSpaces;
}
#define SHOW_SELECTION_CURSOR // should be turned off when the caret code is activated
#ifdef SHOW_SELECTION_CURSOR
// XXX This clearly needs to be done by the container, *somehow*
#define CURSOR_COLOR NS_RGB(0,0,255)
static void
@ -713,6 +718,8 @@ RenderSelectionCursor(nsIRenderingContext& aRenderingContext,
aRenderingContext.FillPolygon(pnts, 4);
}
#endif
// XXX letter-spacing
// XXX word-spacing
@ -848,10 +855,13 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext,
PaintTextDecorations(aRenderingContext, aStyleContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
//aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
//RenderSelectionCursor(aRenderingContext,
// dx + textWidth, dy, mRect.height,
// CURSOR_COLOR);
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
#ifdef SHOW_SELECTION_CURSOR
RenderSelectionCursor(aRenderingContext,
dx + textWidth, dy, mRect.height,
CURSOR_COLOR);
#endif
}
else
{
@ -1175,11 +1185,14 @@ TextFrame::PaintTextSlowly(nsIPresContext& aPresContext,
if (si.mEmptySelection) {
RenderString(aRenderingContext, aStyleContext, aTextStyle,
text, textLength, dx, dy, width);
//GetWidth(aRenderingContext, aTextStyle,
// text, PRUint32(si.mStartOffset), textWidth);
//RenderSelectionCursor(aRenderingContext,
// dx + textWidth, dy, mRect.height,
// CURSOR_COLOR);
#ifdef SHOW_SELECTION_CURSOR
GetWidth(aRenderingContext, aTextStyle,
text, PRUint32(si.mStartOffset), textWidth);
RenderSelectionCursor(aRenderingContext,
dx + textWidth, dy, mRect.height,
CURSOR_COLOR);
#endif
}
else {
nscoord x = dx;
@ -1318,10 +1331,12 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
PaintTextDecorations(aRenderingContext, aStyleContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
//aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
//RenderSelectionCursor(aRenderingContext,
// dx + textWidth, dy, mRect.height,
// CURSOR_COLOR);
#ifdef SHOW_SELECTION_CURSOR
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
RenderSelectionCursor(aRenderingContext,
dx + textWidth, dy, mRect.height,
CURSOR_COLOR);
#endif
}
else
{