Skip to content

W
wine-winehq
Commit 8010ede2 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

dwrite: Enable 'meta' table properties for the font set.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3fb3b872
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dlls/dwrite/font.c
View file @ 8010ede2
...@@ -7157,6 +7157,10 @@ static IDWriteLocalizedStrings * fontset_entry_get_property(struct dwrite_fontse ...@@ -7157,6 +7157,10 @@ static IDWriteLocalizedStrings * fontset_entry_get_property(struct dwrite_fontse
opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_FULL_NAME, &value); opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_FULL_NAME, &value);
else if (property == DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME) else if (property == DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME)
opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, &value); opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, &value);
else if (property == DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG)
opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, &value);
else if (property == DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG)
opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, &value);
else else
WARN("Unsupported property %u.\n", property); WARN("Unsupported property %u.\n", property);
...@@ -7296,6 +7300,8 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE ...@@ -7296,6 +7300,8 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE
{ {
case DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME: case DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME:
case DWRITE_FONT_PROPERTY_ID_FULL_NAME: case DWRITE_FONT_PROPERTY_ID_FULL_NAME:
case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG:
case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG:
if (!(value = fontset_entry_get_property(entry, props[i].propertyId))) if (!(value = fontset_entry_get_property(entry, props[i].propertyId)))
return FALSE; return FALSE;
...@@ -7307,8 +7313,6 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE ...@@ -7307,8 +7313,6 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE
case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME:
case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME: case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME:
case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME:
case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG:
case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG:
case DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG: case DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG:
case DWRITE_FONT_PROPERTY_ID_WEIGHT: case DWRITE_FONT_PROPERTY_ID_WEIGHT:
case DWRITE_FONT_PROPERTY_ID_STRETCH: case DWRITE_FONT_PROPERTY_ID_STRETCH:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment