From f5549a19bf9f41be68c6af8a3a0af9b1099a024e Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 12 May 2016 12:34:35 -0400 Subject: [PATCH] Even more work to bring us closer to the correct answer. uiGroups look right again. We've still got some problems... --- darwin/group.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/darwin/group.m b/darwin/group.m index 0cf06583..5c3bc63a 100644 --- a/darwin/group.m +++ b/darwin/group.m @@ -15,7 +15,8 @@ struct uiGroup { static void removeConstraints(uiGroup *g) { - singleChildConstraintsRemove(&(g->constraints), g->box); + // set to contentView instead of to the box itself, otherwise we get clipping underneath the label + singleChildConstraintsRemove(&(g->constraints), [g->box contentView]); } static void uiGroupDestroy(uiControl *c) @@ -64,7 +65,7 @@ static void groupRelayout(uiGroup *g) return; childView = (NSView *) uiControlHandle(g->child); singleChildConstraintsEstablish(&(g->constraints), - g->box, childView, + [g->box contentView], childView, uiDarwinControlHugsTrailingEdge(uiDarwinControl(g->child)), uiDarwinControlHugsBottom(uiDarwinControl(g->child)), g->margined,