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

Migrated darwin/parent.m to the recent changes.

This commit is contained in:
Pietro Gagliardi 2015-04-17 15:05:32 -04:00
parent 841b5c0c73
commit 81f475000f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
darwin/parent.m
View File

@ -11,7 +11,7 @@
@interface uipParent : NSView { @interface uipParent : NSView {
// TODO // TODO
@public @public
uiControl *child; uiControl *mainControl;
intmax_t marginLeft; intmax_t marginLeft;
intmax_t marginTop; intmax_t marginTop;
intmax_t marginRight; intmax_t marginRight;
@ -29,9 +29,9 @@ uiLogObjCClassAllocations
// we can't just use nil because NSTabView will set page views to nil when they're tabbed away // we can't just use nil because NSTabView will set page views to nil when they're tabbed away
// this means that we have to explicitly move them to the destroyed controls view when we're done with them, and likewise in NSWindow // this means that we have to explicitly move them to the destroyed controls view when we're done with them, and likewise in NSWindow
if ([self superview] == destroyedControlsView) if ([self superview] == destroyedControlsView)
if (self->child != NULL) { if (self->mainControl != NULL) {
uiControlDestroy(self->child); uiControlDestroy(self->mainControl);
self->child = NULL; self->mainControl = NULL;
[self release]; [self release];
} }
[super viewDidMoveToSuperview]; [super viewDidMoveToSuperview];
@ -55,7 +55,7 @@ uiLogObjCClassAllocations
uiSizing d; uiSizing d;
intmax_t x, y, width, height; intmax_t x, y, width, height;
if (self->child == NULL) if (self->mainControl == NULL)
return; return;
x = [self bounds].origin.x + self->marginLeft; x = [self bounds].origin.x + self->marginLeft;
y = [self bounds].origin.y + self->marginTop; y = [self bounds].origin.y + self->marginTop;
@ -63,7 +63,7 @@ uiLogObjCClassAllocations
height = [self bounds].size.height - (self->marginTop + self->marginBottom); height = [self bounds].size.height - (self->marginTop + self->marginBottom);
d.xPadding = macXPadding; d.xPadding = macXPadding;
d.yPadding = macYPadding; d.yPadding = macYPadding;
uiControlResize(self->child, x, y, width, height, &d); uiControlResize(self->mainControl, x, y, width, height, &d);
} }
@end @end
@ -75,13 +75,15 @@ static uintptr_t parentHandle(uiParent *p)
return (uintptr_t) pp; return (uintptr_t) pp;
} }
static void parentSetChild(uiParent *p, uiControl *child) static void parentSetMainControl(uiParent *pp, uiControl *mainControl)
{ {
uipParent *pp = (uipParent *) (p->Internal); uipParent *p = (uipParent *) (pp->Internal);
pp->child = child; if (p->mainControl != NULL)
if (pp->child != NULL) uiControlSetParent(p->mainControl, NULL);
uiControlSetParent(child, p); p->mainControl = mainControl;
if (p->mainControl != NULL)
uiControlSetParent(p->mainControl, pp);
} }
static void parentSetMargins(uiParent *p, intmax_t left, intmax_t top, intmax_t right, intmax_t bottom) static void parentSetMargins(uiParent *p, intmax_t left, intmax_t top, intmax_t right, intmax_t bottom)
@ -108,7 +110,7 @@ uiParent *uiNewParent(uintptr_t osParent)
p = uiNew(uiParent); p = uiNew(uiParent);
p->Internal = [[uipParent alloc] initWithFrame:NSZeroRect]; p->Internal = [[uipParent alloc] initWithFrame:NSZeroRect];
p->Handle = parentHandle; p->Handle = parentHandle;
p->SetChild = parentSetChild; p->SetMainControl = parentSetMainControl;
p->SetMargins = parentSetMargins; p->SetMargins = parentSetMargins;
p->Update = parentUpdate; p->Update = parentUpdate;
// don't use osParent; we'll need to call specific selectors to set the parent view // don't use osParent; we'll need to call specific selectors to set the parent view