From fcf16d33e44b2f3e6818ebf91ce5b77691d27bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 31 Aug 2013 13:55:38 +0200 Subject: [PATCH] HaikuDepot: Fixed spelling of ascent and descent nouns --- src/apps/haiku-depot/textview/GlyphInfo.h | 26 ++++++++++---------- src/apps/haiku-depot/textview/TextLayout.cpp | 4 +-- src/apps/haiku-depot/textview/TextLayout.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/apps/haiku-depot/textview/GlyphInfo.h b/src/apps/haiku-depot/textview/GlyphInfo.h index 00211b7b64..74d70b26ad 100644 --- a/src/apps/haiku-depot/textview/GlyphInfo.h +++ b/src/apps/haiku-depot/textview/GlyphInfo.h @@ -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; diff --git a/src/apps/haiku-depot/textview/TextLayout.cpp b/src/apps/haiku-depot/textview/TextLayout.cpp index fe2186b78d..20eba50f15 100644 --- a/src/apps/haiku-depot/textview/TextLayout.cpp +++ b/src/apps/haiku-depot/textview/TextLayout.cpp @@ -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; } diff --git a/src/apps/haiku-depot/textview/TextLayout.h b/src/apps/haiku-depot/textview/TextLayout.h index b697d230cd..05058b9a65 100644 --- a/src/apps/haiku-depot/textview/TextLayout.h +++ b/src/apps/haiku-depot/textview/TextLayout.h @@ -82,4 +82,4 @@ private: }; -#endif // FILTER_VIEW_H +#endif // TEXT_LAYOUT_H