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

Simplify and make more portable DWrite font weight translation

Browse Source 
There doesn't seem to be any need for painstakingly translating STC font
weight to DWRITE_FONT_WEIGHT when they seem to use exactly the same
numeric values anyhow.

This also fixes compilation when using older SDK versions that don't
define DWRITE_FONT_WEIGHT_SEMI_LIGHT constant, which is relatively
recent (and presence of which can't be easily checked, as it's an enum
element and not a preprocessor constant).
This commit is contained in:
Vadim Zeitlin
2018-01-30 01:21:24 +01:00
parent e1481385c5
commit 1119a44cdd
1 changed files with 1 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/stc/PlatWX.cpp
View File

@@ -710,8 +710,6 @@ SurfaceFontDataD2D::SurfaceFontDataD2D(const FontParameters& fp)
wxCOMPtr<IDWriteTextLayout> pTextLayout; wxCOMPtr<IDWriteTextLayout> pTextLayout;
wxString faceName = fp.faceName; wxString faceName = fp.faceName;
wxString extentTest(EXTENT_TEST); wxString extentTest(EXTENT_TEST);
int weight = fp.weight;
DWRITE_FONT_WEIGHT fontWeight;
DWRITE_FONT_STYLE fontStyle; DWRITE_FONT_STYLE fontStyle;
DWRITE_TEXT_METRICS textmetrics = {0,0,0,0,0,0,0,0,0}; DWRITE_TEXT_METRICS textmetrics = {0,0,0,0,0,0,0,0,0};
const int maxLines = 2; const int maxLines = 2;
@@ -720,59 +718,12 @@ SurfaceFontDataD2D::SurfaceFontDataD2D(const FontParameters& fp)
FLOAT emHeight = 0; FLOAT emHeight = 0;
HRESULT hr; HRESULT hr;
if ( weight <= 100 )
{
fontWeight = DWRITE_FONT_WEIGHT_THIN;
}
else if ( weight <= 200 )
{
fontWeight = DWRITE_FONT_WEIGHT_EXTRA_LIGHT;
}
else if ( weight <= 300 )
{
fontWeight = DWRITE_FONT_WEIGHT_LIGHT;
}
#ifndef __MINGW64_TOOLCHAIN__
else if ( weight <= 350 )
{
fontWeight = DWRITE_FONT_WEIGHT_SEMI_LIGHT;
}
#endif
else if ( weight <= 400 )
{
fontWeight = DWRITE_FONT_WEIGHT_NORMAL;
}
else if ( weight <= 500 )
{
fontWeight = DWRITE_FONT_WEIGHT_MEDIUM;
}
else if ( weight <= 600 )
{
fontWeight = DWRITE_FONT_WEIGHT_SEMI_BOLD;
}
else if ( weight <= 700 )
{
fontWeight = DWRITE_FONT_WEIGHT_BOLD;
}
else if ( weight <= 800 )
{
fontWeight = DWRITE_FONT_WEIGHT_EXTRA_BOLD;
}
else if ( weight <= 900 )
{
fontWeight = DWRITE_FONT_WEIGHT_HEAVY;
}
else
{
fontWeight = DWRITE_FONT_WEIGHT_EXTRA_BLACK;
}
fontStyle = fp.italic?DWRITE_FONT_STYLE_ITALIC:DWRITE_FONT_STYLE_NORMAL; fontStyle = fp.italic?DWRITE_FONT_STYLE_ITALIC:DWRITE_FONT_STYLE_NORMAL;
hr = pDWriteFactory->CreateTextFormat( hr = pDWriteFactory->CreateTextFormat(
faceName.wc_str(), faceName.wc_str(),
NULL, NULL,
fontWeight, static_cast<DWRITE_FONT_WEIGHT>(fp.weight),
fontStyle, fontStyle,
DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STRETCH_NORMAL,
fp.size, fp.size,