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

And fixed build errors. Now I'm sure there are warnings that are real bugs, so let's handle those next.

This commit is contained in:
Pietro Gagliardi 2018-03-10 19:02:10 -05:00
parent c82197f408
commit 9194ba29fe
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/attrstr.h
View File

@ -5,6 +5,8 @@
#define uiprivAlloc(x, y) uiAlloc(x, y)
#define uiprivRealloc(x, y, z) uiRealloc(x, y, z)
#define uiprivFree(x) uiFree(x)
#define uiprivStrdup(x) strdup(x)
#define uiprivStricmp(x, y) strcasecmp(x, y)
// attribute.c
extern uiAttribute *uiprivAttributeRetain(uiAttribute *a);

4
darwin/attrstr.m
View File

@ -281,7 +281,7 @@ static backgroundBlock mkBackgroundBlock(size_t start, size_t end, double r, dou
brush.G = g;
brush.B = b;
brush.A = a;
drawTextBackground(c, x, y, layout, start, end, &brush, 0);
//TODO drawTextBackground(c, x, y, layout, start, end, &brush, 0);
});
}
@ -463,7 +463,7 @@ CFAttributedStringRef uiprivAttributedStringToCFAttributedString(uiDrawTextLayou
CFMutableAttributedStringRef mas;
struct foreachParams fep;
cfstr = CFStringCreateWithCharacters(NULL, attrstrUTF16(p->String), attrstrUTF16Len(p->String));
cfstr = CFStringCreateWithCharacters(NULL, uiprivAttributedStringUTF16String(p->String), uiprivAttributedStringUTF16Len(p->String));
if (cfstr == NULL) {
// TODO
}

2
darwin/fontmatch.m
View File

@ -450,7 +450,7 @@ CTFontDescriptorRef uiprivCTFontDescriptorAppendFeatures(CTFontDescriptorRef des
CFDictionaryRef attrs;
const void *keys[1], *values[1];
featuresArray = otfToFeaturesArray(otf);
featuresArray = uiprivOpenTypeFeaturesToCTFeatures(otf);
keys[0] = kCTFontFeatureSettingsAttribute;
values[0] = featuresArray;
attrs = CFDictionaryCreate(NULL,

5
darwin/main.m
View File

@ -1,5 +1,6 @@
// 6 april 2015
#import "uipriv_darwin.h"
#import "attrstr.h"
static BOOL canQuit = NO;
static NSAutoreleasePool *globalPool;
@ -128,7 +129,7 @@ const char *uiInit(uiInitOptions *o)
uiprivSetupFontPanel();
initUnderlineColors();
uiprivInitUnderlineColors();
}
globalPool = [[NSAutoreleasePool alloc] init];
@ -144,7 +145,7 @@ void uiUninit(void)
[globalPool release];
@autoreleasepool {
uninitUnderlineColors();
uiprivUninitUnderlineColors();
[delegate release];
[realNSApp() setDelegate:nil];
[app release];