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

And implemented the alignment stuff on OS X.

This commit is contained in:
Pietro Gagliardi 2017-02-11 21:10:16 -05:00
parent bd66e70452
commit 44f8409b8c
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
darwin/drawtext.m
View File

@ -46,27 +46,55 @@ static CTFontRef fontdescToCTFont(uiDrawFontDescriptor *fd)
return font; return font;
} }
static CFAttributedStringRef attrstrToCoreFoundation(uiAttributedString *s, uiDrawFontDescriptor *defaultFont) static const CTTextAlignment ctaligns[] = {
[uiDrawTextLayoutAlignLeft] = kCTTextAlignmentLeft,
[uiDrawTextLayoutAlignCenter] = kCTTextAlignmentCenter,
[uiDrawTextLayoutAlignRight] = kCTTextAlignmentRight,
};
static CTParagraphStyleRef mkParagraphStyle(uiDrawTextLayoutParams *p)
{
CTParagraphStyleRef ps;
CTParagraphStyleSetting settings[16];
size_t nSettings = 0;
settings[nSettings].spec = kCTParagraphStyleSpecifierAlignment;
settings[nSettings].valueSize = sizeof (CTTextAlignment);
settings[nSettings].value = ctaligns + p->Align;
nSettings++;
ps = CTParagraphStyleCreate(settings, nSettings);
if (ps == NULL) {
// TODO
}
return ps;
}
static CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p)
{ {
CFStringRef cfstr; CFStringRef cfstr;
CFMutableDictionaryRef defaultAttrs; CFMutableDictionaryRef defaultAttrs;
CTFontRef defaultCTFont; CTFontRef defaultCTFont;
CTParagraphStyleRef ps;
CFAttributedStringRef base; CFAttributedStringRef base;
CFMutableAttributedStringRef mas; CFMutableAttributedStringRef mas;
cfstr = CFStringCreateWithCharacters(NULL, attrstrUTF16(s), attrstrUTF16Len(s)); cfstr = CFStringCreateWithCharacters(NULL, attrstrUTF16(p->String), attrstrUTF16Len(p->String));
if (cfstr == NULL) { if (cfstr == NULL) {
// TODO // TODO
} }
defaultAttrs = CFDictionaryCreateMutable(NULL, 1, defaultAttrs = CFDictionaryCreateMutable(NULL, 0,
&kCFCopyStringDictionaryKeyCallBacks, &kCFCopyStringDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks); &kCFTypeDictionaryValueCallBacks);
if (defaultAttrs == NULL) { if (defaultAttrs == NULL) {
// TODO // TODO
} }
defaultCTFont = fontdescToCTFont(defaultFont); defaultCTFont = fontdescToCTFont(p->DefaultFont);
CFDictionaryAddValue(defaultAttrs, kCTFontAttributeName, defaultCTFont); CFDictionaryAddValue(defaultAttrs, kCTFontAttributeName, defaultCTFont);
CFRelease(defaultCTFont); CFRelease(defaultCTFont);
ps = mkParagraphStyle(p);
CFDictionaryAddValue(defaultAttrs, kCTParagraphStyleAttributeName, ps);
CFRelease(ps);
base = CFAttributedStringCreate(NULL, cfstr, defaultAttrs); base = CFAttributedStringCreate(NULL, cfstr, defaultAttrs);
if (base == NULL) { if (base == NULL) {
@ -163,7 +191,7 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p)
CGRect rect; CGRect rect;
tl = uiNew(uiDrawTextLayout); tl = uiNew(uiDrawTextLayout);
tl->attrstr = attrstrToCoreFoundation(p->String, p->DefaultFont); tl->attrstr = attrstrToCoreFoundation(p);
range.location = 0; range.location = 0;
range.length = CFAttributedStringGetLength(tl->attrstr); range.length = CFAttributedStringGetLength(tl->attrstr);
tl->width = p->Width; tl->width = p->Width;