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

Wrote the new uiTab relayout code. Now to test.

This commit is contained in:
Pietro Gagliardi 2015-08-18 21:14:58 -04:00
parent ca068ecaf2
commit dd3754b9c9
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
redo/reredo/darwin/tab.m
View File

@ -43,6 +43,31 @@ static void onDestroy(uiTab *t)
// TODO container update // TODO container update
static void tabRelayout(uiDarwinControl *c)
{
uiTab *t = uiTab(c);
NSUInteger i;
for (i = 0; i < [t->pages count]; i++) {
NSValue *v;
uiControl *child;
uiDarwinControl *cc;
NSView *view, *childView;
NSNumber *margined;
v = (NSValue *) [t->pages objectAtIndex:i];
child = (uiControl *) [v pointerValue];
view = (NSView *) [t->views objectAtIndex:i];
childView = (NSView *) uiControlHandle(child);
margined = (NSNumber *) [t->margined objectAtIndex:i];
// first lay out the child
cc = uiDarwinControl(child);
(*(cc->Relayout))(cc);
// then lay out the page
layoutSingleView(view, childView, [margined intValue]);
}
}
void uiTabAppend(uiTab *t, const char *name, uiControl *child) void uiTabAppend(uiTab *t, const char *name, uiControl *child)
{ {
uiTabInsertAt(t, name, [t->pages count], child); uiTabInsertAt(t, name, [t->pages count], child);
@ -59,8 +84,6 @@ void uiTabInsertAt(uiTab *t, const char *name, uintmax_t n, uiControl *child)
childView = (NSView *) uiControlHandle(child); childView = (NSView *) uiControlHandle(child);
view = [[NSView alloc] initWithFrame:NSZeroRect]; view = [[NSView alloc] initWithFrame:NSZeroRect];
[view addSubview:childView]; [view addSubview:childView];
layoutSingleView(view, childView, 0);
uiDarwinControlRelayoutParent(uiDarwinControl(t));
[t->pages insertObject:[NSValue valueWithPointer:child] atIndex:n]; [t->pages insertObject:[NSValue valueWithPointer:child] atIndex:n];
[t->views insertObject:view atIndex:n]; [t->views insertObject:view atIndex:n];
@ -70,6 +93,8 @@ void uiTabInsertAt(uiTab *t, const char *name, uintmax_t n, uiControl *child)
[i setLabel:toNSString(name)]; [i setLabel:toNSString(name)];
[i setView:view]; [i setView:view];
[t->tabview insertTabViewItem:i atIndex:n]; [t->tabview insertTabViewItem:i atIndex:n];
uiDarwinControlTriggerRelayout(uiDarwinControl(t));
} }
void uiTabDelete(uiTab *t, uintmax_t n) void uiTabDelete(uiTab *t, uintmax_t n)
@ -110,20 +135,10 @@ int uiTabMargined(uiTab *t, uintmax_t n)
void uiTabSetMargined(uiTab *t, uintmax_t n, int margined) void uiTabSetMargined(uiTab *t, uintmax_t n, int margined)
{ {
NSNumber *v; NSNumber *v;
NSView *view;
NSValue *childv;
uiControl *child;
NSView *childView;
v = [NSNumber numberWithInt:margined]; v = [NSNumber numberWithInt:margined];
[t->margined replaceObjectAtIndex:n withObject:v]; [t->margined replaceObjectAtIndex:n withObject:v];
uiDarwinControlTriggerRelayout(uiDarwinControl(t));
view = (NSView *) [t->views objectAtIndex:n];
childv = (NSValue *) [t->pages objectAtIndex:n];
child = (uiControl *) [childv pointerValue];
childView = (NSView *) uiControlHandle(child);
layoutSingleView(view, childView, margined);
uiDarwinControlRelayoutParent(uiDarwinControl(t));
} }
uiTab *uiNewTab(void) uiTab *uiNewTab(void)
@ -141,6 +156,7 @@ uiTab *uiNewTab(void)
t->margined = [NSMutableArray new]; t->margined = [NSMutableArray new];
uiDarwinFinishNewControl(t, uiTab); uiDarwinFinishNewControl(t, uiTab);
uiDarwinControl(t)->Relayout = tabRelayout;
return t; return t;
} }