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

More work. This is annoying, stupid 10.9.

This commit is contained in:
Pietro Gagliardi 2017-02-15 19:42:32 -05:00
parent 6761c0a9f7
commit ddffce6d44
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
darwin/fontmatch.m
View File

@ -327,6 +327,7 @@ CTFontDescriptorRef fontdescAppendFeatures(CTFontDescriptorRef desc, const uint1
uint16_t typ; uint16_t typ;
typ = kLanguageTagType; typ = kLanguageTagType;
il++;
numType = CFNumberCreate(NULL, kCFNumberSInt16Type, numType = CFNumberCreate(NULL, kCFNumberSInt16Type,
(const SInt16 *) (&typ)); (const SInt16 *) (&typ));
numSelector = CFNumberCreate(NULL, kCFNumberCFIndexType, numSelector = CFNumberCreate(NULL, kCFNumberCFIndexType,

17
examples/drawtext/attributes.c
View File

@ -139,6 +139,7 @@ static void setupAttributedString(void)
uiAttributedStringAppendUnattributed(attrstr, ", "); uiAttributedStringAppendUnattributed(attrstr, ", ");
// thanks to https://twitter.com/codeman38/status/831924064012886017
next = "\xD0\xB1\xD0\xB3\xD0\xB4\xD0\xBF\xD1\x82"; next = "\xD0\xB1\xD0\xB3\xD0\xB4\xD0\xBF\xD1\x82";
uiAttributedStringAppendUnattributed(attrstr, "multiple languages (compare "); uiAttributedStringAppendUnattributed(attrstr, "multiple languages (compare ");
start = uiAttributedStringLen(attrstr); start = uiAttributedStringLen(attrstr);
@ -181,9 +182,8 @@ static uiDrawTextLayoutParams params;
#define margins 10 #define margins 10
static uiBox *panel; static uiBox *panel;
static uiCheckbox *showExtents;
static uiCheckbox *showLineBounds; static uiCheckbox *showLineBounds;
static uiCheckbox *showLineGuides; static uiFontButton *fontButton;
// TODO should be const? // TODO should be const?
static uiDrawBrush fillBrushes[4] = { static uiDrawBrush fillBrushes[4] = {
@ -266,6 +266,15 @@ static void draw(uiAreaDrawParams *p)
static struct example attributesExample; static struct example attributesExample;
static void changeFont(uiFontButton *b, void *data)
{
if (defaultFont.Family != fontFamily)
uiFreeText(defaultFont.Family);
// TODO rename defaultFont
uiFontButtonFont(fontButton, &defaultFont);
redraw();
}
// TODO share? // TODO share?
static void checkboxChecked(uiCheckbox *c, void *data) static void checkboxChecked(uiCheckbox *c, void *data)
{ {
@ -286,6 +295,10 @@ struct example *mkAttributesExample(void)
{ {
panel = uiNewVerticalBox(); panel = uiNewVerticalBox();
showLineBounds = newCheckbox("Show Line Bounds"); showLineBounds = newCheckbox("Show Line Bounds");
fontButton = uiNewFontButton();
uiFontButtonOnChanged(fontButton, changeFont, NULL);
// TODO set the font button to the current defaultFont
uiBoxAppend(panel, uiControl(fontButton), 0);
attributesExample.name = "Attributed Text"; attributesExample.name = "Attributed Text";
attributesExample.panel = uiControl(panel); attributesExample.panel = uiControl(panel);