OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0030474: Visualization - fallback font is ignored for missing font alias within Font_FontMgr::FindFont()

Browse Source
This commit is contained in:
kgv 2019-02-04 14:04:21 +03:00
parent 99d9eb3933
commit d517575214
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Font/Font_FontMgr.cxx
View File

@ -702,20 +702,25 @@ Handle(Font_SystemFont) Font_FontMgr::FindFont (const TCollection_AsciiString& t
} }
// Trying to use font names mapping // Trying to use font names mapping
Handle(Font_FontAliasSequence) anAliases; for (int aPass = 0; aPass < 2; ++aPass)
const Standard_Boolean hasAliases = myFontAliases.Find (aFontName, anAliases)
&& !anAliases.IsNull()
&& !anAliases->IsEmpty();
if (!hasAliases
&& aFont.IsNull())
{ {
anAliases = myFallbackAlias; Handle(Font_FontAliasSequence) anAliases;
} if (aPass == 0)
{
myFontAliases.Find (aFontName, anAliases);
}
else
{
anAliases = myFallbackAlias;
}
bool isAliasUsed = false, isBestAlias = false; if (anAliases.IsNull()
if (!anAliases.IsNull() || anAliases->IsEmpty())
&& !anAliases->IsEmpty()) {
{ continue;
}
bool isAliasUsed = false, isBestAlias = false;
for (Font_FontAliasSequence::Iterator anAliasIter (*anAliases); anAliasIter.More(); anAliasIter.Next()) for (Font_FontAliasSequence::Iterator anAliasIter (*anAliases); anAliasIter.More(); anAliasIter.Next())
{ {
const Font_FontAlias& anAlias = anAliasIter.Value(); const Font_FontAlias& anAlias = anAliasIter.Value();
@ -737,24 +742,29 @@ Handle(Font_SystemFont) Font_FontMgr::FindFont (const TCollection_AsciiString& t
} }
else if (anAlias.FontAspect == Font_FontAspect_UNDEFINED else if (anAlias.FontAspect == Font_FontAspect_UNDEFINED
&& (theFontAspect == Font_FontAspect_UNDEFINED && (theFontAspect == Font_FontAspect_UNDEFINED
|| aFont2->HasFontAspect (theFontAspect))) || aFont2->HasFontAspect (theFontAspect)))
{ {
isBestAlias = true; isBestAlias = true;
break; break;
} }
} }
} }
if (hasAliases)
if (aPass == 0)
{ {
if (isAliasUsed && myToTraceAliases) if (isAliasUsed && myToTraceAliases)
{ {
Message::DefaultMessenger()->Send (TCollection_AsciiString("Font_FontMgr, using font alias '") + aFont->FontName() + "'" Message::DefaultMessenger()->Send (TCollection_AsciiString("Font_FontMgr, using font alias '") + aFont->FontName() + "'"
" instead of requested '" + theFontName +"'", Message_Trace); " instead of requested '" + theFontName +"'", Message_Trace);
} }
if (isBestAlias) if (isBestAlias)
{ {
return aFont; return aFont;
} }
else if (!aFont.IsNull())
{
break;
}
} }
} }