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

FIxed the various uiGroup glitches. Woo!

This commit is contained in:
Pietro Gagliardi 2016-05-01 12:00:10 -04:00
parent 022f0a2591
commit 896c2590c5
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
darwin/group.m
View File

@ -1,9 +1,35 @@
// 14 august 2015 // 14 august 2015
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
// TODO test empty groups
// for whatever reason, if there is an intrinsic content size on the NSBox, Auto Layout won't bother checking the box's children...
@interface libuiIntrinsicBox : NSBox {
BOOL libui_hasChild;
}
- (void)libui_setHasChild:(BOOL)h;
@end
@implementation libuiIntrinsicBox
- (void)libui_setHasChild:(BOOL)h
{
self->libui_hasChild = h;
[self invalidateIntrinsicContentSize];
}
- (NSSize)intrinsicContentSize
{
if (!self->libui_hasChild)
return [super intrinsicContentSize];
return NSMakeSize(NSViewNoIntrinsicMetric, NSViewNoIntrinsicMetric);
}
@end
struct uiGroup { struct uiGroup {
uiDarwinControl c; uiDarwinControl c;
NSBox *box; libuiIntrinsicBox *box;
uiControl *child; uiControl *child;
int margined; int margined;
}; };
@ -54,9 +80,7 @@ static void groupRelayout(uiGroup *g)
childView = (NSView *) uiControlHandle(g->child); childView = (NSView *) uiControlHandle(g->child);
// first relayout the child // first relayout the child
//TODO (*(cc->Relayout))(cc); //TODO (*(cc->Relayout))(cc);
// now relayout ourselves layoutSingleView([g->box contentView], childView, g->margined, @"uiGroup");
// see below on using the content view
layoutSingleView(g->box, childView, g->margined, @"uiGroup");
// we need to explicitly tell the NSBox to recompute its own size based on the new content layout // we need to explicitly tell the NSBox to recompute its own size based on the new content layout
[g->box sizeToFit]; [g->box sizeToFit];
} }
@ -83,13 +107,11 @@ void uiGroupSetChild(uiGroup *g, uiControl *child)
uiControlSetParent(g->child, NULL); uiControlSetParent(g->child, NULL);
} }
g->child = child; g->child = child;
[g->box libui_setHasChild:(g->child != NULL)];
if (g->child != NULL) { if (g->child != NULL) {
childView = (NSView *) uiControlHandle(g->child); childView = (NSView *) uiControlHandle(g->child);
uiControlSetParent(g->child, uiControl(g)); uiControlSetParent(g->child, uiControl(g));
// we have to add controls to the box itself NOT the content view uiDarwinControlSetSuperview(uiDarwinControl(g->child), [g->box contentView]);
// 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)
uiDarwinControlSetSuperview(uiDarwinControl(g->child), g->box);
uiDarwinControlSyncEnableState(uiDarwinControl(g->child), uiControlEnabledToUser(uiControl(g))); uiDarwinControlSyncEnableState(uiDarwinControl(g->child), uiControlEnabledToUser(uiControl(g)));
} }
groupRelayout(g); groupRelayout(g);
@ -112,7 +134,7 @@ uiGroup *uiNewGroup(const char *title)
uiDarwinNewControl(uiGroup, g); uiDarwinNewControl(uiGroup, g);
g->box = [[NSBox alloc] initWithFrame:NSZeroRect]; g->box = [[libuiIntrinsicBox alloc] initWithFrame:NSZeroRect];
[g->box setTitle:toNSString(title)]; [g->box setTitle:toNSString(title)];
[g->box setBoxType:NSBoxPrimary]; [g->box setBoxType:NSBoxPrimary];
[g->box setBorderType:NSLineBorder]; [g->box setBorderType:NSLineBorder];
@ -120,6 +142,7 @@ uiGroup *uiNewGroup(const char *title)
[g->box setTitlePosition:NSAtTop]; [g->box setTitlePosition:NSAtTop];
// 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]]];
[g->box libui_setHasChild:NO];
return g; return g;
} }