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

Rename SetFamilyAndStyle variable to code matching the header and BeBook.

Browse Source
This commit is contained in:
John Scipione
2013-01-19 13:17:47 -05:00
parent c969b46240
commit 840476e1cb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Font.cpp
+5 -5
View File
@@ -558,7 +558,7 @@ BFont::SetFamilyAndStyle(const font_family family, const font_style style)
// Sets the font's family and style all at once // Sets the font's family and style all at once
void void
BFont::SetFamilyAndStyle(uint32 fontcode) BFont::SetFamilyAndStyle(uint32 code)
{ {
// R5 has a bug here: the face is not updated even though the IDs are set. // R5 has a bug here: the face is not updated even though the IDs are set.
// This is a problem because the face flag includes Regular/Bold/Italic // This is a problem because the face flag includes Regular/Bold/Italic
@@ -567,8 +567,8 @@ BFont::SetFamilyAndStyle(uint32 fontcode)
// than R5's in order to be correct // than R5's in order to be correct
uint16 family, style; uint16 family, style;
style = fontcode & 0xFFFF; style = code & 0xFFFF;
family = (fontcode & 0xFFFF0000) >> 16; family = (code & 0xFFFF0000) >> 16;
BPrivate::AppServerLink link; BPrivate::AppServerLink link;
link.StartMessage(AS_GET_FAMILY_AND_STYLE_IDS); link.StartMessage(AS_GET_FAMILY_AND_STYLE_IDS);
@@ -578,8 +578,8 @@ BFont::SetFamilyAndStyle(uint32 fontcode)
link.Attach<uint16>(style); link.Attach<uint16>(style);
link.Attach<uint16>(fFace); link.Attach<uint16>(fFace);
int32 code; int32 fontcode;
if (link.FlushWithReply(code) != B_OK || code != B_OK) if (link.FlushWithReply(fontcode) != B_OK || fontcode != B_OK)
return; return;
link.Read<uint16>(&fFamilyID); link.Read<uint16>(&fFamilyID);