sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

When applying a named style to a font, check for untranslated style if the translated one is missing

Browse Source
This commit is contained in:
Mathieu Pellerin 2025-05-31 17:12:01 +07:00 committed by Nyall Dawson
parent 7fec082fea
commit 9773739d20
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/qgsfontutils.cpp
View File

@ -158,11 +158,18 @@ bool QgsFontUtils::updateFontViaStyle( QFont &f, const QString &fontstyle, bool
} }
QFontDatabase fontDB; QFontDatabase fontDB;
QString actualFontStyle = fontstyle;
if ( !fallback ) if ( !fallback )
{ {
// does the font even have the requested style? // does the font even have the requested style?
const bool hasstyle = fontFamilyHasStyle( f.family(), fontstyle ); bool hasstyle = fontFamilyHasStyle( f.family(), actualFontStyle );
if ( !hasstyle )
{
actualFontStyle = untranslateNamedStyle( fontstyle );
hasstyle = fontFamilyHasStyle( f.family(), actualFontStyle );
}
if ( !hasstyle ) if ( !hasstyle )
{ {
return false; return false;
@ -170,7 +177,7 @@ bool QgsFontUtils::updateFontViaStyle( QFont &f, const QString &fontstyle, bool
} }
// is the font's style already the same as requested? // is the font's style already the same as requested?
if ( fontstyle == fontDB.styleString( f ) ) if ( actualFontStyle == fontDB.styleString( f ) )
{ {
return false; return false;
} }
@ -182,8 +189,8 @@ bool QgsFontUtils::updateFontViaStyle( QFont &f, const QString &fontstyle, bool
bool foundmatch = false; bool foundmatch = false;
// if fontDB.font() fails, it returns the default app font; but, that may be the target style // if fontDB.font() fails, it returns the default app font; but, that may be the target style
styledfont = fontDB.font( f.family(), fontstyle, defaultSize ); styledfont = fontDB.font( f.family(), actualFontStyle, defaultSize );
if ( appfont != styledfont || fontstyle != fontDB.styleString( f ) ) if ( appfont != styledfont || actualFontStyle != fontDB.styleString( f ) )
{ {
foundmatch = true; foundmatch = true;
} }