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

* Added LinkReceiver methods that return the length of the string.

Browse Source 
* AS_GET_STRING_WIDTHS now uses this method to send the strings to the app_server;
  ie. it no longer sends the whole strings, and it saves sending the string length
  separately.
* BFont::StringWidth() will now always return 0.0f in case of an error (instead of
  some random value)
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16525 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-02-27 13:09:37 +00:00
parent 30da2fcb94
commit 2ed942c199
4 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Font.cpp
+8 -9
View File
@@ -984,9 +984,9 @@ float
BFont::StringWidth(const char *string, int32 length) const
{
if (!string || length < 1)
return 0.0;
return 0.0f;
float width;
float width = 0.0f;
GetStringWidths(&string, &length, 1, &width);
return width;
@@ -1011,13 +1011,12 @@ BFont::GetStringWidths(const char *stringArray[], const int32 lengthArray[],
// TODO: all strings into a single array???
// we do have a maximum message length, and it could be easily touched here...
for (int32 i = 0; i < numStrings; i++) {
link.Attach<int32>(lengthArray[i]);
link.AttachString(stringArray[i]);
link.AttachString(stringArray[i], lengthArray[i]);
}
int32 code;
if (link.FlushWithReply(code) != B_OK
|| code != B_OK)
status_t status;
if (link.FlushWithReply(status) != B_OK
|| status != B_OK)
return;
link.Read(widthArray, sizeof(float) * numStrings);
@@ -1046,8 +1045,8 @@ BFont::GetEscapements(const char charArray[], int32 numChars, escapement_delta *
link.Attach<float>(fRotation);
link.Attach<uint32>(fFlags);
link.Attach<float>(delta ? delta->nonspace : 0.0);
link.Attach<float>(delta ? delta->space : 0.0);
link.Attach<float>(delta ? delta->nonspace : 0.0f);
link.Attach<float>(delta ? delta->space : 0.0f);
link.Attach<int32>(numChars);
// TODO: Should we not worry about the port capacity here?!?