interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More stuff. I should probably write that OpenType features test now.

This commit is contained in:
Pietro Gagliardi 2017-06-10 03:37:17 -04:00
parent d63a5b23b1
commit f0813ac6e4
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darwin/attrstr.m
View File

@ -372,6 +372,8 @@ static void applyAndFreeFontAttributes(struct foreachParams *p)
font = defaultFont; font = defaultFont;
CFRetain(font); CFRetain(font);
} else } else
// note that this handles the difference between NULL and empty uiOpenTypeFeatures properly as far as conversion to native data formats is concerned (NULL does not generate a features dictionary; empty just produces an empty one)
// TODO but what about from the OS's perspective on all OSs?
font = [cfa toCTFont]; font = [cfa toCTFont];
CFAttributedStringSetAttribute(p->mas, range, kCTFontAttributeName, font); CFAttributedStringSetAttribute(p->mas, range, kCTFontAttributeName, font);
CFRelease(font); CFRelease(font);

2
ui_attrstr.h
View File

@ -92,7 +92,7 @@ _UI_ENUM(uiDrawUnderlineColor) {
// a glyph shape to use. // a glyph shape to use.
// //
// If a font does not support a certain feature, that feature will be // If a font does not support a certain feature, that feature will be
// ignored. // ignored. (TODO verify this on all OSs)
// //
// See the OpenType specification at // See the OpenType specification at
// https://www.microsoft.com/typography/otspec/featuretags.htm // https://www.microsoft.com/typography/otspec/featuretags.htm

5
unix/attrstr.c
View File

@ -154,7 +154,10 @@ static uiForEach processAttribute(uiAttributedString *s, uiAttributeSpec *spec,
} }
break; break;
case uiAttributeFeatures: case uiAttributeFeatures:
// TODO make sure NULLs are handled properly on all platforms in this part of the code // only generate an attribute if spec->Features is not NULL
// TODO state that this is allowed
if (spec->Features == NULL)
break;
featurestr = otfToPangoCSSString(spec->Features); featurestr = otfToPangoCSSString(spec->Features);
addattr(p, start, end, addattr(p, start, end,
FUTURE_pango_attr_font_features_new(featurestr)); FUTURE_pango_attr_font_features_new(featurestr));

4
windows/attrstr.cpp
View File

@ -174,7 +174,9 @@ static uiForEach processAttribute(uiAttributedString *s, uiAttributeSpec *spec,
} }
break; break;
case uiAttributeFeatures: case uiAttributeFeatures:
// TODO make sure this behaves properly if spec->Features is NULL // only generate an attribute if spec->Features is not NULL
if (spec->Features == NULL)
break;
dt = otfToDirectWrite(spec->Features); dt = otfToDirectWrite(spec->Features);
hr = p->layout->SetTypography(dt, range); hr = p->layout->SetTypography(dt, range);
if (hr != S_OK) if (hr != S_OK)