Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-22 06:16:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

GetEscapements() didnt' take the font spacing into account. Looks like the spacing is ignored by the font backend, though, am I correct?

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18990 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2006-10-03 11:46:55 +00:00
parent 0b77c8eb4f
commit c585b1f46d
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kits/interface/Font.cpp
View File

@ -1047,6 +1047,7 @@ BFont::GetEscapements(const char charArray[], int32 numChars, escapement_delta *
link.Attach<uint16>(fFamilyID);
link.Attach<uint16>(fStyleID);
link.Attach<float>(fSize);
link.Attach<uint8>(fSpacing);
link.Attach<float>(fRotation);
link.Attach<uint32>(fFlags);
@ -1088,6 +1089,7 @@ BFont::GetEscapements(const char charArray[], int32 numChars, escapement_delta *
link.Attach<uint16>(fFamilyID);
link.Attach<uint16>(fStyleID);
link.Attach<float>(fSize);
link.Attach<uint8>(fSpacing);
link.Attach<float>(fRotation);
link.Attach<uint32>(fFlags);

34
src/servers/app/ServerApp.cpp
View File

@ -1637,11 +1637,12 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
// 1) uint16 - family ID
// 2) uint16 - style ID
// 3) float - point size
// 4) float - rotation
// 5) uint32 - flags
// 6) int32 - numChars
// 7) char - char -\ both
// 8) BPoint - offset -/ (numChars times)
// 4) uint8 - spacing
// 5) float - rotation
// 6) uint32 - flags
// 7) int32 - numChars
// 8) char - char -\ both
// 9) BPoint - offset -/ (numChars times)
// Returns:
// 1) BPoint - escapement
@ -1650,10 +1651,12 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
uint16 familyID, styleID;
uint32 flags;
float size, rotation;
uint8 spacing;
link.Read<uint16>(&familyID);
link.Read<uint16>(&styleID);
link.Read<float>(&size);
link.Read<uint8>(&spacing);
link.Read<float>(&rotation);
link.Read<uint32>(&flags);
@ -1676,6 +1679,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
status_t status = font.SetFamilyAndStyle(familyID, styleID);
if (status == B_OK) {
font.SetSize(size);
font.SetSpacing(spacing);
font.SetRotation(rotation);
font.SetFlags(flags);
@ -1716,15 +1720,16 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
// 1) uint16 - family ID
// 2) uint16 - style ID
// 3) float - point size
// 4) float - rotation
// 5) uint32 - flags
// 4) uint8 - spacing
// 5) float - rotation
// 6) uint32 - flags
// 6) float - additional "nonspace" delta
// 7) float - additional "space" delta
// 7) float - additional "nonspace" delta
// 8) float - additional "space" delta
// 8) int32 - numChars
// 9) int32 - numBytes
// 10) char - the char buffer with size numBytes
// 9) int32 - numChars
// 10) int32 - numBytes
// 11) char - the char buffer with size numBytes
// Returns:
// 1) float - escapement buffer with numChar entries
@ -1732,10 +1737,12 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
uint16 familyID, styleID;
uint32 flags;
float size, rotation;
uint8 spacing;
link.Read<uint16>(&familyID);
link.Read<uint16>(&styleID);
link.Read<float>(&size);
link.Read<uint8>(&spacing);
link.Read<float>(&rotation);
link.Read<uint32>(&flags);
@ -1759,6 +1766,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
status_t status = font.SetFamilyAndStyle(familyID, styleID);
if (status == B_OK) {
font.SetSize(size);
font.SetSpacing(spacing);
font.SetRotation(rotation);
font.SetFlags(flags);