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

Implemented the new uiTab changes on the Mac OS X backend.

This commit is contained in:
Pietro Gagliardi 2015-04-30 16:34:38 -04:00
parent 10345a2c7d
commit d215ee147f
1 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
darwin/tab.m
View File

@ -1,13 +1,11 @@
// 12 april 2015 // 12 april 2015
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
// TODO
// - verify margins against extra space around the tab
struct tab { struct tab {
uiTab t; uiTab t;
NSTabView *tabview; NSTabView *tabview;
NSMutableArray *pages; NSMutableArray *pages;
NSMutableArray *margined;
}; };
static void destroy(void *data) static void destroy(void *data)
@ -23,6 +21,7 @@ static void destroy(void *data)
uiControlDestroy(uiControl(p)); uiControlDestroy(uiControl(p));
}]; }];
[t->pages release]; [t->pages release];
[t->margined release];
uiFree(t); uiFree(t);
} }
@ -47,6 +46,7 @@ static void tabAppendPage(uiTab *tt, const char *name, uiControl *child)
page = newBin(); page = newBin();
binSetMainControl(page, child); binSetMainControl(page, child);
[t->pages addObject:[NSValue valueWithPointer:page]]; [t->pages addObject:[NSValue valueWithPointer:page]];
[t->margined addObject:[NSNumber numberWithInt:0]];
i = [[NSTabViewItem alloc] initWithIdentifier:nil]; i = [[NSTabViewItem alloc] initWithIdentifier:nil];
[i setLabel:toNSString(name)]; [i setLabel:toNSString(name)];
@ -64,6 +64,7 @@ static void tabDeletePage(uiTab *tt, uintmax_t n)
v = (NSValue *) [t->pages objectAtIndex:n]; v = (NSValue *) [t->pages objectAtIndex:n];
p = (uiContainer *) [v pointerValue]; p = (uiContainer *) [v pointerValue];
[t->pages removeObjectAtIndex:n]; [t->pages removeObjectAtIndex:n];
[t->margined removeObjectAtIndex:n];
// make sure the children of the tab aren't destroyed // make sure the children of the tab aren't destroyed
binSetMainControl(p, NULL); binSetMainControl(p, NULL);
@ -73,6 +74,50 @@ static void tabDeletePage(uiTab *tt, uintmax_t n)
[t->tabview removeTabViewItem:i]; [t->tabview removeTabViewItem:i];
} }
static uintmax_t tabNumPages(uiTab *tt)
{
struct tab *t = (struct tab *) tt;
return [t->pages count];
}
static int tabMargined(uiTab *tt, uintmax_t n)
{
struct tab *t = (struct tab *) tt;
NSNumber *v;
v = (NSNumber *) [t->margined objectAtIndex:n];
return [v intValue];
}
// These are based on measurements from Interface Builder.
// These seem to be based on Auto Layout constants, but I don't see an API that exposes these...
#define tabLeftMargin 17
#define tabTopMargin 3
#define tabRightMargin 17
#define tabBottomMargin 17
// notes:
// top margin of a tab to its parent should be 12, not 20
// our system doesn't allow this...
static void tabSetMargined(uiTab *tt, uintmax_t n, int margined)
{
struct tab *t = (struct tab *) tt;
NSNumber *v;
NSValue *binv;
uiContainer *bin;
v = [NSNumber numberWithInt:margined];
[t->margined replaceObjectAtIndex:n withObject:v];
binv = (NSValue *) [t->pages objectAtIndex:n];
bin = (uiContainer *) [binv pointerValue];
if ([v intValue])
binSetMargins(bin, tabLeftMargin, tabTopMargin, tabRightMargin, tabBottomMargin);
else
binSetMargins(bin, 0, 0, 0, 0);
}
uiTab *uiNewTab(void) uiTab *uiNewTab(void)
{ {
struct tab *t; struct tab *t;
@ -87,11 +132,15 @@ uiTab *uiNewTab(void)
setStandardControlFont((NSControl *) (t->tabview)); setStandardControlFont((NSControl *) (t->tabview));
t->pages = [NSMutableArray new]; t->pages = [NSMutableArray new];
t->margined = [NSMutableArray new];
uiControl(t)->PreferredSize = preferredSize; uiControl(t)->PreferredSize = preferredSize;
uiTab(t)->AppendPage = tabAppendPage; uiTab(t)->AppendPage = tabAppendPage;
uiTab(t)->DeletePage = tabDeletePage; uiTab(t)->DeletePage = tabDeletePage;
uiTab(t)->NumPages = tabNumPages;
uiTab(t)->Margined = tabMargined;
uiTab(t)->SetMargined = tabSetMargined;
return uiTab(t); return uiTab(t);
} }