Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BFont::_GetExtraFlags() no longer returns a status value, but fills in default

Browse Source 
values in case the server communication failed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14742 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-11-07 11:08:27 +00:00
parent b2cc345461
commit 42b5ae7db9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/os/interface/Font.h
View File

@ -247,7 +247,7 @@ class BFont {
mutable uint32 fExtraFlags;
uint32 _reserved[2];
status_t _GetExtraFlags() const;
void _GetExtraFlags() const;
void _GetBoundingBoxes(const char charArray[],
int32 numChars, font_metric_mode mode,
bool string_escapement, escapement_delta *delta,

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

@ -585,9 +585,7 @@ BFont::Flags() const
font_direction
BFont::Direction() const
{
if (_GetExtraFlags() != B_OK)
return B_FONT_LEFT_TO_RIGHT;
_GetExtraFlags();
return (font_direction)(fExtraFlags >> B_PRIVATE_FONT_DIRECTION_SHIFT);
}
@ -1170,12 +1168,12 @@ BFont::PrintToStream() const
}
status_t
void
BFont::_GetExtraFlags() const
{
// TODO: this has to be const in order to allow other font getters to stay const as well
if (fExtraFlags != kUninitializedExtraFlags)
return B_OK;
return;
BPrivate::AppServerLink link;
link.StartMessage(AS_GET_EXTRA_FONT_FLAGS);
@ -1184,9 +1182,11 @@ BFont::_GetExtraFlags() const
status_t status = B_ERROR;
if (link.FlushWithReply(status) != B_OK
|| status != B_OK)
return status;
|| status != B_OK) {
// use defaut values for the flags
fExtraFlags = (uint32)B_FONT_LEFT_TO_RIGHT << B_PRIVATE_FONT_DIRECTION_SHIFT;
return;
}
link.Read<uint32>(&fExtraFlags);
return B_OK;
}