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

shear is needed for GetBoundingBoxes

Browse Source 
now uses _GetBoundingBoxes_ for GetBoundingBoxesAsGlyphs and GetBoundingBoxesAsString


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14071 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-08-26 08:40:24 +00:00
parent 43ffbcc46e
commit 697085a5aa
2 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Font.cpp
+12 -1
View File
@@ -1039,13 +1039,21 @@ void
BFont::GetBoundingBoxesAsGlyphs(const char charArray[], int32 numChars, font_metric_mode mode,
BRect boundingBoxArray[]) const
{
GetBoundingBoxesAsString(charArray, numChars, mode, NULL, boundingBoxArray);
_GetBoundingBoxes_(charArray, numChars, mode, false, NULL, boundingBoxArray);
}
void
BFont::GetBoundingBoxesAsString(const char charArray[], int32 numChars, font_metric_mode mode,
escapement_delta *delta, BRect boundingBoxArray[]) const
{
_GetBoundingBoxes_(charArray, numChars, mode, true, delta, boundingBoxArray);
}
void
BFont::_GetBoundingBoxes_(const char charArray[], int32 numChars, font_metric_mode mode,
bool string_escapement, escapement_delta *delta, BRect boundingBoxArray[]) const
{
if (!charArray || numChars < 1 || !boundingBoxArray)
return;
@@ -1058,8 +1066,10 @@ BFont::GetBoundingBoxesAsString(const char charArray[], int32 numChars, font_met
link.Attach<uint16>(fStyleID);
link.Attach<float>(fSize);
link.Attach<float>(fRotation);
link.Attach<float>(fShear);
link.Attach<uint32>(fFlags);
link.Attach<font_metric_mode>(mode);
link.Attach<bool>(string_escapement);
if (delta) {
link.Attach<escapement_delta>(*delta);
@@ -1096,6 +1106,7 @@ BFont::GetBoundingBoxesForStrings(const char *stringArray[], int32 numStrings,
link.Attach<uint16>(fStyleID);
link.Attach<float>(fSize);
link.Attach<float>(fRotation);
link.Attach<float>(fShear);
link.Attach<uint32>(fFlags);
link.Attach<font_metric_mode>(mode);
link.Attach<int32>(numStrings);