chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Gfx: Improve D2D support for subfamilies like 'Light'

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-04-08 18:24:09 +03:00
parent 7c90f65659
commit 4d22c5ac61
2 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Common/Gfx/TextFormatD2D.cpp
View File

@ -97,26 +97,23 @@ void TextFormatD2D::SetProperties(const WCHAR* fontFamily, int size, bool bold,
// |fontFamily| uses the GDI/GDI+ font naming convention so try to create DirectWrite font // |fontFamily| uses the GDI/GDI+ font naming convention so try to create DirectWrite font
// using the GDI family name and then create a text format using the DirectWrite family name // using the GDI family name and then create a text format using the DirectWrite family name
// obtained from it. // obtained from it.
IDWriteFont* dwFont = CreateDWFontFromGDIFamilyName(fontFamily, bold, italic); WCHAR dwFamilyName[LF_FACESIZE];
if (dwFont) DWRITE_FONT_WEIGHT dwFontWeight;
DWRITE_FONT_STYLE dwFontStyle;
DWRITE_FONT_STRETCH dwFontStretch;
if (GetDWPropertiesFromGDIProperties(
fontFamily, bold, italic, dwFontWeight, dwFontStyle, dwFontStretch, dwFamilyName,
_countof(dwFamilyName)))
{ {
WCHAR buffer[LF_FACESIZE]; hr = CanvasD2D::c_DWFactory->CreateTextFormat(
if (GetFamilyNameFromDWFont(dwFont, buffer, _countof(buffer))) dwFamilyName,
{ nullptr,
// TODO: If |fontFamily| is e.g. 'Segoe UI Semibold' and |bold| is true, we might want dwFontWeight,
// to make the weight heaver to match GDI+. dwFontStyle,
hr = CanvasD2D::c_DWFactory->CreateTextFormat( dwFontStretch,
buffer, size * (4.0f / 3.0f),
nullptr, L"",
dwFont->GetWeight(), &m_TextFormat);
dwFont->GetStyle(),
DWRITE_FONT_STRETCH_NORMAL,
size * (4.0f / 3.0f),
L"",
&m_TextFormat);
}
dwFont->Release();
} }
if (FAILED(hr)) if (FAILED(hr))
@ -191,7 +188,52 @@ void TextFormatD2D::SetVerticalAlignment(VerticalAlignment alignment)
} }
} }
IDWriteFont* TextFormatD2D::CreateDWFontFromGDIFamilyName(const WCHAR* fontFamily, bool bold, bool italic) bool TextFormatD2D::GetDWPropertiesFromGDIProperties(
const WCHAR* gdiFamilyName, const bool gdiBold, const bool gdiItalic,
DWRITE_FONT_WEIGHT& dwFontWeight, DWRITE_FONT_STYLE& dwFontStyle,
DWRITE_FONT_STRETCH& dwFontStretch, WCHAR* dwFamilyName, UINT dwFamilyNameSize)
{
bool result = false;
IDWriteFont* dwFont = CreateDWFontFromGDIFamilyName(gdiFamilyName);
if (dwFont)
{
if (GetFamilyNameFromDWFont(dwFont, dwFamilyName, dwFamilyNameSize))
{
dwFontWeight = dwFont->GetWeight();
if (gdiBold)
{
if (dwFontWeight == DWRITE_FONT_WEIGHT_NORMAL)
{
dwFontWeight = DWRITE_FONT_WEIGHT_BOLD;
}
else if (dwFontWeight < DWRITE_FONT_WEIGHT_ULTRA_BOLD)
{
// If 'gdiFamilyName' was e.g. 'Segoe UI Light', |dwFontWeight| wil be equal to
// DWRITE_FONT_WEIGHT_LIGHT. If |gdiBold| is true in that case, we need to
// increase the weight a little more for similar results with GDI+.
// TODO: Is +100 enough?
dwFontWeight = (DWRITE_FONT_WEIGHT)(dwFontWeight + 100);
}
}
dwFontStyle = dwFont->GetStyle();
if (gdiItalic && dwFontStyle == DWRITE_FONT_STYLE_NORMAL)
{
dwFontStyle = DWRITE_FONT_STYLE_ITALIC;
}
dwFontStretch = dwFont->GetStretch();
result = true;
}
dwFont->Release();
}
return result;
}
IDWriteFont* TextFormatD2D::CreateDWFontFromGDIFamilyName(const WCHAR* fontFamily)
{ {
IDWriteGdiInterop* dwGdiInterop; IDWriteGdiInterop* dwGdiInterop;
HRESULT hr = CanvasD2D::c_DWFactory->GetGdiInterop(&dwGdiInterop); HRESULT hr = CanvasD2D::c_DWFactory->GetGdiInterop(&dwGdiInterop);
@ -199,10 +241,8 @@ IDWriteFont* TextFormatD2D::CreateDWFontFromGDIFamilyName(const WCHAR* fontFamil
{ {
LOGFONT lf = {}; LOGFONT lf = {};
wcscpy_s(lf.lfFaceName, fontFamily); wcscpy_s(lf.lfFaceName, fontFamily);
lf.lfWidth = 12; lf.lfHeight = -12;
lf.lfHeight = 12; lf.lfWeight = FW_DONTCARE;
lf.lfWeight = bold ? FW_BOLD : FW_NORMAL;
lf.lfItalic = (BYTE)italic;
lf.lfCharSet = DEFAULT_CHARSET; lf.lfCharSet = DEFAULT_CHARSET;
lf.lfOutPrecision = OUT_DEFAULT_PRECIS; lf.lfOutPrecision = OUT_DEFAULT_PRECIS;
lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;

9
Common/Gfx/TextFormatD2D.h
View File

@ -50,11 +50,18 @@ private:
// changes. // changes.
void CreateLayout(const WCHAR* str, UINT strLen, float maxW, float maxH); void CreateLayout(const WCHAR* str, UINT strLen, float maxW, float maxH);
// Maps the GDI family name and italic/bold flags to the DirectWrite family name, weight, style,
// and stretch.
static bool GetDWPropertiesFromGDIProperties(
const WCHAR* gdiFamilyName, const bool gdiBold, const bool gdiItalic,
DWRITE_FONT_WEIGHT& dwFontWeight, DWRITE_FONT_STYLE& dwFontStyle,
DWRITE_FONT_STRETCH& dwFontStretch, WCHAR* dwFamilyName, UINT dwFamilyNameSize);
// Creates a IDWriteFont using the GDI family name instead of the DirectWrite family name. For // Creates a IDWriteFont using the GDI family name instead of the DirectWrite family name. For
// example, 'Segoe UI' and 'Segoe UI Semibold' are separate family names with GDI whereas // example, 'Segoe UI' and 'Segoe UI Semibold' are separate family names with GDI whereas
// DirectWrite uses the family name 'Segoe UI' for both and differentiates them by the font // DirectWrite uses the family name 'Segoe UI' for both and differentiates them by the font
// style. // style.
static IDWriteFont* CreateDWFontFromGDIFamilyName(const WCHAR* fontFamily, bool bold, bool italic); static IDWriteFont* CreateDWFontFromGDIFamilyName(const WCHAR* fontFamily);
static bool GetFamilyNameFromDWFont(IDWriteFont* font, WCHAR* buffer, UINT bufferSize); static bool GetFamilyNameFromDWFont(IDWriteFont* font, WCHAR* buffer, UINT bufferSize);
static bool GetFamilyNameFromDWFontFamily(IDWriteFontFamily* fontFamily, WCHAR* buffer, UINT bufferSize); static bool GetFamilyNameFromDWFontFamily(IDWriteFontFamily* fontFamily, WCHAR* buffer, UINT bufferSize);