i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HaikuDepot: Fixed spelling of ascent and descent nouns

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/haiku-depot/textview/GlyphInfo.h
+13 -13
View File
@@ -16,23 +16,23 @@ public:
x(0.0f), x(0.0f),
y(0.0f), y(0.0f),
advanceX(0.0f), advanceX(0.0f),
maxAscend(0.0f), maxAscent(0.0f),
maxDescend(0.0f), maxDescent(0.0f),
lineIndex(0), lineIndex(0),
style() style()
{ {
} }
GlyphInfo(uint32 charCode, float x, float y, float advanceX, GlyphInfo(uint32 charCode, float x, float y, float advanceX,
float maxAscend, float maxDescend, int lineIndex, float maxAscent, float maxDescent, int lineIndex,
const TextStyleRef& style) const TextStyleRef& style)
: :
charCode(charCode), charCode(charCode),
x(x), x(x),
y(y), y(y),
advanceX(advanceX), advanceX(advanceX),
maxAscend(maxAscend), maxAscent(maxAscent),
maxDescend(maxDescend), maxDescent(maxDescent),
lineIndex(lineIndex), lineIndex(lineIndex),
style(style) style(style)
{ {
@@ -44,8 +44,8 @@ public:
x(other.x), x(other.x),
y(other.y), y(other.y),
advanceX(other.advanceX), advanceX(other.advanceX),
maxAscend(other.maxAscend), maxAscent(other.maxAscent),
maxDescend(other.maxDescend), maxDescent(other.maxDescent),
lineIndex(other.lineIndex), lineIndex(other.lineIndex),
style(other.style) style(other.style)
{ {
@@ -57,8 +57,8 @@ public:
x = other.x; x = other.x;
y = other.y; y = other.y;
advanceX = other.advanceX; advanceX = other.advanceX;
maxAscend = other.maxAscend; maxAscent = other.maxAscent;
maxDescend = other.maxDescend; maxDescent = other.maxDescent;
lineIndex = other.lineIndex; lineIndex = other.lineIndex;
style = other.style; style = other.style;
return *this; return *this;
@@ -70,8 +70,8 @@ public:
&& x == other.x && x == other.x
&& y == other.y && y == other.y
&& advanceX == other.advanceX && advanceX == other.advanceX
&& maxAscend == other.maxAscend && maxAscent == other.maxAscent
&& maxDescend == other.maxDescend && maxDescent == other.maxDescent
&& lineIndex == other.lineIndex && lineIndex == other.lineIndex
&& style == other.style; && style == other.style;
} }
@@ -88,8 +88,8 @@ public:
float y; float y;
float advanceX; float advanceX;
float maxAscend; float maxAscent;
float maxDescend; float maxDescent;
int lineIndex; int lineIndex;
src/apps/haiku-depot/textview/TextLayout.cpp
+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)); fLineInfos.Add(LineInfo(lineStart, y, lineHeight, maxAscent, maxDescent));
for (int i = lineStart; i <= lineEnd; i++) { for (int i = lineStart; i <= lineEnd; i++) {
fGlyphInfoBuffer[i].maxAscend = maxAscent; fGlyphInfoBuffer[i].maxAscent = maxAscent;
fGlyphInfoBuffer[i].maxDescend = maxDescent; fGlyphInfoBuffer[i].maxDescent = maxDescent;
fGlyphInfoBuffer[i].lineIndex = lineIndex; fGlyphInfoBuffer[i].lineIndex = lineIndex;
fGlyphInfoBuffer[i].y += maxAscent; fGlyphInfoBuffer[i].y += maxAscent;
} }
src/apps/haiku-depot/textview/TextLayout.h
+1 -1
View File
@@ -82,4 +82,4 @@ private:
}; };
#endif // FILTER_VIEW_H #endif // TEXT_LAYOUT_H