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

Changed uiAttributeVerticalForms into a boolean. This is how the other features might need to be implemented :/

This commit is contained in:
Pietro Gagliardi 2017-02-13 22:42:18 -05:00
parent 9a19c65323
commit 35a06e8540
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/attrlist.c
View File

@ -284,6 +284,13 @@ static struct attr *attrDeleteRange(struct attrlist *alist, struct attr *a, size
return a->next;
}
static int boolsEqual(struct attr *attr, uiAttributeSpec *spec)
{
if (attr->spec.Value == 0 && spec->Value == 0)
return 1;
return attr->spec.Value != 0 && spec->Value != 0;
}
static int specsIdentical(struct attr *attr, uiAttributeSpec *spec)
{
if (attr->spec.Type != spec->Type)
@ -303,7 +310,7 @@ static int specsIdentical(struct attr *attr, uiAttributeSpec *spec)
attr->spec.B == spec->B &&
attr->spec.A == spec->A;
case uiAttributeVerticalForms:
return 1;
return boolsEqual(attr, spec);
// TODO
}
// handles the rest

5
darwin/attrstr.m
View File

@ -132,7 +132,10 @@ static int processAttribute(uiAttributedString *s, uiAttributeSpec *spec, size_t
Block_release(block);
break;
case uiAttributeVerticalForms:
CFAttributedStringSetAttribute(p->mas, range, kCTVerticalFormsAttributeName, kCFBooleanTrue);
if (spec->Value != 0)
CFAttributedStringSetAttribute(p->mas, range, kCTVerticalFormsAttributeName, kCFBooleanTrue);
else
CFAttributedStringSetAttribute(p->mas, range, kCTVerticalFormsAttributeName, kCFBooleanFalse);
break;
// TODO
}

1
examples/drawtext/attributes.c
View File

@ -96,6 +96,7 @@ static void setupAttributedString(void)
end = start + strlen(next);
uiAttributedStringAppendUnattributed(attrstr, next);
spec.Type = uiAttributeVerticalForms;
spec.Value = 1;
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
uiAttributedStringAppendUnattributed(attrstr, " (which you can draw rotated for proper vertical text)");

2
ui_attrstr.h
View File

@ -9,7 +9,7 @@ _UI_ENUM(uiAttribute) {
uiAttributeStretch,
uiAttributeColor, // use R, G, B, A
uiAttributeBackground, // use R, G, B, A
uiAttributeVerticalForms, // no parameter
uiAttributeVerticalForms, // 0 = off, nonzero = 1
// TODO
// TODO uiAttributeSystem,
// TODO uiAttributeCustom,