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

Migrated darwin/group.m. That just leaves darwin/tab.m and a few fixups to a number of other controls.

This commit is contained in:
Pietro Gagliardi 2016-04-25 12:42:43 -04:00
parent f0ca2dcee5
commit b50eda0303
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
darwin/group.m
View File

@ -8,30 +8,39 @@ struct uiGroup {
int margined; int margined;
}; };
static void onDestroy(uiGroup *); static void uiGroupDestroy(uiControl *c)
uiDarwinDefineControlWithOnDestroy(
uiGroup, // type name
box, // handle
onDestroy(this); // on destroy
)
static void onDestroy(uiGroup *g)
{ {
uiGroup *g = uiGroup(c);
if (g->child != NULL) { if (g->child != NULL) {
uiControlSetParent(g->child, NULL); uiControlSetParent(g->child, NULL);
uiControlDestroy(g->child); uiControlDestroy(g->child);
} }
[g->box release];
uiFreeControl(uiControl(g));
} }
static void groupContainerUpdateState(uiControl *c) uiDarwinControlDefaultHandle(uiGroup, box)
uiDarwinControlDefaultParent(uiGroup, box)
uiDarwinControlDefaultSetParent(uiGroup, box)
uiDarwinControlDefaultToplevel(uiGroup, box)
uiDarwinControlDefaultVisible(uiGroup, box)
uiDarwinControlDefaultShow(uiGroup, box)
uiDarwinControlDefaultHide(uiGroup, box)
uiDarwinControlDefaultEnabled(uiGroup, box)
uiDarwinControlDefaultEnable(uiGroup, box)
uiDarwinControlDefaultDisable(uiGroup, box)
static void uiBoxSyncEnableState(uiControl *c, int enabled)
{ {
uiGroup *g = uiGroup(c); uiGroup *g = uiGroup(c);
if (g->child != NULL) if (g->child != NULL)
controlUpdateState(g->child); uiControlSyncEnableState(g->child);
} }
uiDarwinControlDefaultSetSuperview(uiGroup, box)
static void groupRelayout(uiDarwinControl *c) static void groupRelayout(uiDarwinControl *c)
{ {
uiGroup *g = uiGroup(c); uiGroup *g = uiGroup(c);
@ -81,8 +90,8 @@ void uiGroupSetChild(uiGroup *g, uiControl *child)
// otherwise, things get really glitchy // otherwise, things get really glitchy
// we also need to call -sizeToFit, but we'll do that in the relayout that's triggered below (see above) // we also need to call -sizeToFit, but we'll do that in the relayout that's triggered below (see above)
[g->box addSubview:childView]; [g->box addSubview:childView];
uiDarwinControlTriggerRelayout(uiDarwinControl(g));
} }
groupRelayout(g);
} }
int uiGroupMargined(uiGroup *g) int uiGroupMargined(uiGroup *g)
@ -93,15 +102,14 @@ int uiGroupMargined(uiGroup *g)
void uiGroupSetMargined(uiGroup *g, int margined) void uiGroupSetMargined(uiGroup *g, int margined)
{ {
g->margined = margined; g->margined = margined;
if (g->child != NULL) groupRelayout(g);
uiDarwinControlTriggerRelayout(uiDarwinControl(g));
} }
uiGroup *uiNewGroup(const char *title) uiGroup *uiNewGroup(const char *title)
{ {
uiGroup *g; uiGroup *g;
g = (uiGroup *) uiNewControl(uiGroup); uiDarwinNewControl(uiGroup, g);
g->box = [[NSBox alloc] initWithFrame:NSZeroRect]; g->box = [[NSBox alloc] initWithFrame:NSZeroRect];
[g->box setTitle:toNSString(title)]; [g->box setTitle:toNSString(title)];
@ -112,9 +120,5 @@ uiGroup *uiNewGroup(const char *title)
// we can't use uiDarwinSetControlFont() because the selector is different // we can't use uiDarwinSetControlFont() because the selector is different
[g->box setTitleFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]]; [g->box setTitleFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
uiDarwinFinishNewControl(g, uiGroup);
uiControl(g)->ContainerUpdateState = groupContainerUpdateState;
uiDarwinControl(g)->Relayout = groupRelayout;
return g; return g;
} }