Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add numeric weights support for ports using XLFD-based fonts

Browse Source 
Translate numeric weight to the symbolic name too instead of only doing
it in the other direction in GetNumericWeight().
This commit is contained in:
Vadim Zeitlin
2018-09-07 03:15:35 +02:00
parent 6dd9f4208e
commit 7500a999bd
1 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/unix/fontutil.cpp
View File

@@ -823,28 +823,58 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style)
SetXFontComponent(wxXLFD_SLANT, s);
}
void wxNativeFontInfo::SetWeight(wxFontWeight weight)
void wxNativeFontInfo::SetNumericWeight(int weight)
{
wxString s;
switch ( weight )
switch ( wxFont::GetWeightClosestToNumericValue(weight) )
{
case wxFONTWEIGHT_BOLD:
s = wxT("bold");
case wxFONTWEIGHT_THIN:
s = "thin";
break;
case wxFONTWEIGHT_EXTRALIGHT:
s = "extralight";
break;
case wxFONTWEIGHT_LIGHT:
s = wxT("light");
s = "light";
break;
case wxFONTWEIGHT_NORMAL:
s = wxT("medium");
s = "normal";
break;
default:
wxFAIL_MSG( wxT("unknown wxFontWeight in wxNativeFontInfo::SetWeight") );
return;
case wxFONTWEIGHT_MEDIUM:
s = "medium";
break;
case wxFONTWEIGHT_SEMIBOLD:
s = "semibold";
break;
case wxFONTWEIGHT_BOLD:
s = "bold";
break;
case wxFONTWEIGHT_EXTRABOLD:
s = "extrabold";
break;
case wxFONTWEIGHT_HEAVY:
s = "heavy";
break;
case wxFONTWEIGHT_EXTRAHEAVY:
s = "extraheavy";
break;
case wxFONTWEIGHT_INVALID:
wxFAIL_MSG( "Invalid font weight" );
break;
}
wxCHECK_RET( !s.empty(), "unknown weight value" );
SetXFontComponent(wxXLFD_WEIGHT, s);
}