HaikuDepot: Fixed spelling of ascent and descent nouns

This commit is contained in:
Stephan Aßmus
2013-09-02 12:15:14 +02:00
parent 01f623b00f
commit fcf16d33e4
3 changed files with 16 additions and 16 deletions
+13 -13
View File
@@ -16,23 +16,23 @@ public:
x(0.0f),
y(0.0f),
advanceX(0.0f),
maxAscend(0.0f),
maxDescend(0.0f),
maxAscent(0.0f),
maxDescent(0.0f),
lineIndex(0),
style()
{
}
GlyphInfo(uint32 charCode, float x, float y, float advanceX,
float maxAscend, float maxDescend, int lineIndex,
float maxAscent, float maxDescent, int lineIndex,
const TextStyleRef& style)
:
charCode(charCode),
x(x),
y(y),
advanceX(advanceX),
maxAscend(maxAscend),
maxDescend(maxDescend),
maxAscent(maxAscent),
maxDescent(maxDescent),
lineIndex(lineIndex),
style(style)
{
@@ -44,8 +44,8 @@ public:
x(other.x),
y(other.y),
advanceX(other.advanceX),
maxAscend(other.maxAscend),
maxDescend(other.maxDescend),
maxAscent(other.maxAscent),
maxDescent(other.maxDescent),
lineIndex(other.lineIndex),
style(other.style)
{
@@ -57,8 +57,8 @@ public:
x = other.x;
y = other.y;
advanceX = other.advanceX;
maxAscend = other.maxAscend;
maxDescend = other.maxDescend;
maxAscent = other.maxAscent;
maxDescent = other.maxDescent;
lineIndex = other.lineIndex;
style = other.style;
return *this;
@@ -70,8 +70,8 @@ public:
&& x == other.x
&& y == other.y
&& advanceX == other.advanceX
&& maxAscend == other.maxAscend
&& maxDescend == other.maxDescend
&& maxAscent == other.maxAscent
&& maxDescent == other.maxDescent
&& lineIndex == other.lineIndex
&& style == other.style;
}
@@ -88,8 +88,8 @@ public:
float y;
float advanceX;
float maxAscend;
float maxDescend;
float maxAscent;
float maxDescent;
int lineIndex;
+2 -2
View File
@@ -554,8 +554,8 @@ TextLayout::_FinalizeLine(int lineStart, int lineEnd, int lineIndex, float y,
fLineInfos.Add(LineInfo(lineStart, y, lineHeight, maxAscent, maxDescent));
for (int i = lineStart; i <= lineEnd; i++) {
fGlyphInfoBuffer[i].maxAscend = maxAscent;
fGlyphInfoBuffer[i].maxDescend = maxDescent;
fGlyphInfoBuffer[i].maxAscent = maxAscent;
fGlyphInfoBuffer[i].maxDescent = maxDescent;
fGlyphInfoBuffer[i].lineIndex = lineIndex;
fGlyphInfoBuffer[i].y += maxAscent;
}
+1 -1
View File
@@ -82,4 +82,4 @@ private:
};
#endif // FILTER_VIEW_H
#endif // TEXT_LAYOUT_H