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

spacing is needed for GetBoundingBoxes too (string case)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14072 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-08-26 08:47:17 +00:00
parent 697085a5aa
commit 3cf915cb23
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Font.cpp
+3
View File
@@ -1067,6 +1067,8 @@ BFont::_GetBoundingBoxes_(const char charArray[], int32 numChars, font_metric_mo
link.Attach<float>(fSize); link.Attach<float>(fSize);
link.Attach<float>(fRotation); link.Attach<float>(fRotation);
link.Attach<float>(fShear); link.Attach<float>(fShear);
link.Attach<uint8>(fSpacing);
link.Attach<uint32>(fFlags); link.Attach<uint32>(fFlags);
link.Attach<font_metric_mode>(mode); link.Attach<font_metric_mode>(mode);
link.Attach<bool>(string_escapement); link.Attach<bool>(string_escapement);
@@ -1107,6 +1109,7 @@ BFont::GetBoundingBoxesForStrings(const char *stringArray[], int32 numStrings,
link.Attach<float>(fSize); link.Attach<float>(fSize);
link.Attach<float>(fRotation); link.Attach<float>(fRotation);
link.Attach<float>(fShear); link.Attach<float>(fShear);
link.Attach<uint8>(fSpacing);
link.Attach<uint32>(fFlags); link.Attach<uint32>(fFlags);
link.Attach<font_metric_mode>(mode); link.Attach<font_metric_mode>(mode);
link.Attach<int32>(numStrings); link.Attach<int32>(numStrings);
src/servers/app/ServerApp.cpp
+22 -14
View File
@@ -1950,17 +1950,18 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
// 2) uint16 - style ID // 2) uint16 - style ID
// 3) float - point size // 3) float - point size
// 4) float - rotation // 4) float - rotation
// 5) shear - shear // 5) float - shear
// 6) uint32 - flags // 6) uint8 - spacing
// 7) uint32 - flags
// 7) font_metric_mode - mode // 8) font_metric_mode - mode
// 8) bool - string escapement // 9) bool - string escapement
// 9) escapement_delta - additional delta // 10) escapement_delta - additional delta
// 10) int32 - numChars // 11) int32 - numChars
// 11) int32 - numBytes // 12) int32 - numBytes
// 12) char - the char buffer with size numBytes // 13) char - the char buffer with size numBytes
// Returns: // Returns:
// 1) BRect - rects with numChar entries // 1) BRect - rects with numChar entries
@@ -1968,6 +1969,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
uint16 famid, styid; uint16 famid, styid;
uint32 flags; uint32 flags;
float ptsize, rotation, shear; float ptsize, rotation, shear;
uint8 spacing;
font_metric_mode mode; font_metric_mode mode;
bool string_escapement; bool string_escapement;
@@ -1976,6 +1978,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
link.Read<float>(&ptsize); link.Read<float>(&ptsize);
link.Read<float>(&rotation); link.Read<float>(&rotation);
link.Read<float>(&shear); link.Read<float>(&shear);
link.Read<uint8>(&spacing);
link.Read<uint32>(&flags); link.Read<uint32>(&flags);
link.Read<font_metric_mode>(&mode); link.Read<font_metric_mode>(&mode);
link.Read<bool>(&string_escapement); link.Read<bool>(&string_escapement);
@@ -2001,6 +2004,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
font.SetSize(ptsize); font.SetSize(ptsize);
font.SetRotation(rotation); font.SetRotation(rotation);
font.SetShear(shear); font.SetShear(shear);
font.SetSpacing(spacing);
font.SetFlags(flags); font.SetFlags(flags);
// TODO implement for real // TODO implement for real
@@ -2026,14 +2030,15 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
// 3) float - point size // 3) float - point size
// 4) float - rotation // 4) float - rotation
// 5) float - shear // 5) float - shear
// 6) uint32 - flags // 6) uint8 - spacing
// 7) uint32 - flags
// 7) font_metric_mode - mode // 8) font_metric_mode - mode
// 8) int32 numStrings // 9) int32 numStrings
// 9) escapement_delta - additional delta (numStrings times) // 10) escapement_delta - additional delta (numStrings times)
// 10) int32 string length to measure (numStrings times) // 11) int32 string length to measure (numStrings times)
// 11) string - string (numStrings times) // 12) string - string (numStrings times)
// Returns: // Returns:
// 1) BRect - rects with numStrings entries // 1) BRect - rects with numStrings entries
@@ -2041,6 +2046,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
uint16 famid, styid; uint16 famid, styid;
uint32 flags; uint32 flags;
float ptsize, rotation, shear; float ptsize, rotation, shear;
uint8 spacing;
font_metric_mode mode; font_metric_mode mode;
link.Read<uint16>(&famid); link.Read<uint16>(&famid);
@@ -2048,6 +2054,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
link.Read<float>(&ptsize); link.Read<float>(&ptsize);
link.Read<float>(&rotation); link.Read<float>(&rotation);
link.Read<float>(&shear); link.Read<float>(&shear);
link.Read<uint8>(&spacing);
link.Read<uint32>(&flags); link.Read<uint32>(&flags);
link.Read<font_metric_mode>(&mode); link.Read<font_metric_mode>(&mode);
@@ -2072,6 +2079,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
font.SetSize(ptsize); font.SetSize(ptsize);
font.SetRotation(rotation); font.SetRotation(rotation);
font.SetShear(shear); font.SetShear(shear);
font.SetSpacing(spacing);
font.SetFlags(flags); font.SetFlags(flags);
// TODO implement for real // TODO implement for real