Started the implementation of uiForm on OS X. Mostly works, but there are Auto Layout glitches (of course there are Auto Layout glitches)

darwin/CMakeLists.txt

@@ -18,6 +18,7 @@ list(APPEND _LIBUI_SOURCES
 	darwin/editablecombo.m
 	darwin/entry.m
 	darwin/fontbutton.m
+	darwin/form.m
 	darwin/group.m
 	darwin/label.m
 	darwin/main.m

darwin/form.m

@@ -0,0 +1,414 @@
+// 7 june 2016
+#import "uipriv_darwin.h"
+
+@interface formChild : NSObject
+@property uiControl *c;
+@property (strong) NSTextField *label;
+@property BOOL stretchy;
+@property NSLayoutPriority oldHorzHuggingPri;
+@property NSLayoutPriority oldVertHuggingPri;
+@property (strong) NSLayoutConstraint *baseline;
+- (NSView *)view;
+@end
+
+@interface formView : NSView {
+	uiForm *f;
+	NSMutableArray *children;
+	int padded;
+	uintmax_t nStretchy;
+
+	NSLayoutConstraint *first;
+	NSMutableArray *inBetweens;
+	NSLayoutConstraint *last;
+	NSMutableArray *widths;
+	NSMutableArray *leadings;
+	NSMutableArray *middles;
+	NSMutableArray *trailings;
+}
+- (id)initWithF:(uiForm *)ff;
+- (void)onDestroy;
+- (void)removeOurConstraints;
+- (void)syncEnableStates:(int)enabled;
+- (CGFloat)paddingAmount;
+- (void)establishOurConstraints;
+- (void)append:(NSString *)label c:(uiControl *)c stretchy:(int)stretchy;
+//TODO- (void)delete:(uintmax_t)n;
+- (int)isPadded;
+- (void)setPadded:(int)p;
+- (BOOL)hugsTrailing;
+- (BOOL)hugsBottom;
+@end
+
+struct uiForm {
+	uiDarwinControl c;
+	formView *view;
+};
+
+@implementation formChild
+
+- (NSView *)view
+{
+	return (NSView *) uiControlHandle(self.c);
+}
+
+@end
+
+@implementation formView
+
+- (id)initWithF:(uiForm *)ff
+{
+	self = [super initWithFrame:NSZeroRect];
+	if (self != nil) {
+		self->f = ff;
+		self->padded = 0;
+		self->children = [NSMutableArray new];
+		self->nStretchy = 0;
+
+		self->inBetweens = [NSMutableArray new];
+		self->widths = [NSMutableArray new];
+		self->leadings = [NSMutableArray new];
+		self->middles = [NSMutableArray new];
+		self->trailings = [NSMutableArray new];
+	}
+	return self;
+}
+
+- (void)onDestroy
+{
+	formChild *fc;
+
+	[self removeOurConstraints];
+	[self->inBetweens release];
+	[self->widths release];
+	[self->leadings release];
+	[self->middles release];
+	[self->trailings release];
+
+	for (fc in self->children) {
+		[self removeConstraint:fc.baseline];
+		fc.baseline = nil;
+		uiControlSetParent(fc.c, NULL);
+		uiDarwinControlSetSuperview(uiDarwinControl(fc.c), nil);
+		uiControlDestroy(fc.c);
+		[fc.label removeFromSuperview];
+		fc.label = nil;
+	}
+	[self->children release];
+}
+
+- (void)removeOurConstraints
+{
+	if (self->first != nil) {
+		[self removeConstraint:self->first];
+		[self->first release];
+		self->first = nil;
+	}
+	if ([self->inBetweens count] != 0) {
+		[self removeConstraints:self->inBetweens];
+		[self->inBetweens removeAllObjects];
+	}
+	if (self->last != nil) {
+		[self removeConstraint:self->last];
+		[self->last release];
+		self->last = nil;
+	}
+	if ([self->widths count] != 0) {
+		[self removeConstraints:self->widths];
+		[self->widths removeAllObjects];
+	}
+	if ([self->leadings count] != 0) {
+		[self removeConstraints:self->leadings];
+		[self->leadings removeAllObjects];
+	}
+	if ([self->middles count] != 0) {
+		[self removeConstraints:self->middles];
+		[self->middles removeAllObjects];
+	}
+	if ([self->trailings count] != 0) {
+		[self removeConstraints:self->trailings];
+		[self->trailings removeAllObjects];
+	}
+}
+
+- (void)syncEnableStates:(int)enabled
+{
+	formChild *fc;
+
+	for (fc in self->children)
+		uiDarwinControlSyncEnableState(uiDarwinControl(fc.c), enabled);
+}
+
+- (CGFloat)paddingAmount
+{
+	if (!self->padded)
+		return 0.0;
+	return uiDarwinPaddingAmount(NULL);
+}
+
+- (void)establishOurConstraints
+{
+	formChild *fc;
+	CGFloat padding;
+	NSView *prev, *prevlabel;;
+	NSLayoutConstraint *c;
+	NSLayoutRelation relation;
+
+	[self removeOurConstraints];
+	if ([self->children count] == 0)
+		return;
+	padding = [self paddingAmount];
+
+	// first arrange the children vertically and make them the same width
+	prev = nil;
+	for (fc in self->children) {
+		if (prev == nil) {			// first view
+			self->first = mkConstraint(self, NSLayoutAttributeTop,
+				NSLayoutRelationEqual,
+				[fc view], NSLayoutAttributeTop,
+				1, 0,
+				@"uiForm first vertical constraint");
+			[self addConstraint:self->first];
+			[self->first retain];
+			prev = [fc view];
+			prevlabel = fc.label;
+			continue;
+		}
+		// not the first; link it
+		c = mkConstraint(prev, NSLayoutAttributeBottom,
+			NSLayoutRelationEqual,
+			[fc view], NSLayoutAttributeTop,
+			1, -padding,
+			@"uiForm in-between vertical constraint");
+		[self addConstraint:c];
+		[self->inBetweens addObject:c];
+		// and make the same width
+		c = mkConstraint(prev, NSLayoutAttributeWidth,
+			NSLayoutRelationEqual,
+			[fc view], NSLayoutAttributeWidth,
+			1, 0,
+			@"uiForm control width constraint");
+		[self addConstraint:c];
+		[self->widths addObject:c];
+		c = mkConstraint(prevlabel, NSLayoutAttributeWidth,
+			NSLayoutRelationEqual,
+			fc.label, NSLayoutAttributeWidth,
+			1, 0,
+			@"uiForm label lwidth constraint");
+		[self addConstraint:c];
+		[self->widths addObject:c];
+		prev = [fc view];
+		prevlabel = fc.label;
+	}
+	relation = NSLayoutRelationEqual;
+	if (self->nStretchy != 0)
+		relation = NSLayoutRelationLessThanOrEqual;
+	self->last = mkConstraint(prev, NSLayoutAttributeBottom,
+		NSLayoutRelationEqual,
+		self, NSLayoutAttributeBottom,
+		1, 0,
+		@"uiForm last vertical constraint");
+	[self addConstraint:self->last];
+	[self->last retain];
+
+	// now arrange the controls horizontally
+	for (fc in self->children) {
+		c = mkConstraint(self, NSLayoutAttributeLeading,
+			NSLayoutRelationEqual,
+			fc.label, NSLayoutAttributeLeading,
+			1, 0,
+			@"uiForm leading constraint");
+		[self addConstraint:c];
+		[self->leadings addObject:c];
+		c = mkConstraint(fc.label, NSLayoutAttributeTrailing,
+			NSLayoutRelationEqual,
+			[fc view], NSLayoutAttributeLeading,
+			1, -padding,
+			@"uiForm middle constraint");
+		[self addConstraint:c];
+		[self->middles addObject:c];
+		c = mkConstraint([fc view], NSLayoutAttributeTrailing,
+			NSLayoutRelationEqual,
+			self, NSLayoutAttributeTrailing,
+			1, 0,
+			@"uiForm trailing constraint");
+		[self addConstraint:c];
+		[self->trailings addObject:c];
+	}
+
+	// we don't arrange the labels vertically; that's done when we add the control since those constraints don't need to change (they just need to be at their baseline)
+}
+
+- (void)append:(NSString *)label c:(uiControl *)c stretchy:(int)stretchy
+{
+	formChild *fc;
+	NSLayoutPriority priority;
+	NSLayoutAttribute attribute;
+	uintmax_t oldnStretchy;
+
+	fc = [formChild new];
+	fc.c = c;
+	fc.label = newLabel(label);
+	[fc.label setTranslatesAutoresizingMaskIntoConstraints:NO];
+	[self addSubview:fc.label];
+	fc.stretchy = stretchy;
+	fc.oldHorzHuggingPri = uiDarwinControlHuggingPriority(uiDarwinControl(fc.c), NSLayoutConstraintOrientationHorizontal);
+	fc.oldVertHuggingPri = uiDarwinControlHuggingPriority(uiDarwinControl(fc.c), NSLayoutConstraintOrientationVertical);
+
+	uiControlSetParent(fc.c, uiControl(self->f));
+	uiDarwinControlSetSuperview(uiDarwinControl(fc.c), self);
+	uiDarwinControlSyncEnableState(uiDarwinControl(fc.c), uiControlEnabledToUser(uiControl(self->f)));
+
+	// if a control is stretchy, it should not hug vertically
+	// otherwise, it should *forcibly* hug
+	if (fc.stretchy)
+		priority = NSLayoutPriorityDefaultLow;
+	else
+		// LONGTERM will default high work?
+		priority = NSLayoutPriorityRequired;
+	uiDarwinControlSetHuggingPriority(uiDarwinControl(fc.c), priority, NSLayoutConstraintOrientationVertical);
+	// make sure controls don't hug their horizontal direction so they fill the width of the view
+	uiDarwinControlSetHuggingPriority(uiDarwinControl(fc.c), NSLayoutPriorityDefaultLow, NSLayoutConstraintOrientationHorizontal);
+
+	// and constrain the baselines to position the label vertically
+	// if the view is a scroll view, align tops, not baselines
+	// this is what Interface Builder does
+	attribute = NSLayoutAttributeBaseline;
+	if ([[fc view] isKindOfClass:[NSScrollView class]])
+		attribute = NSLayoutAttributeTop;
+	fc.baseline = mkConstraint(fc.label, attribute,
+		NSLayoutRelationEqual,
+		[fc view], attribute,
+		1, 0,
+		@"uiForm baseline constraint");
+	[self addConstraint:fc.baseline];
+
+	[self->children addObject:fc];
+
+	[self establishOurConstraints];
+	if (fc.stretchy) {
+		oldnStretchy = self->nStretchy;
+		self->nStretchy++;
+		if (oldnStretchy == 0)
+			uiDarwinNotifyEdgeHuggingChanged(uiDarwinControl(self->f));
+	}
+
+	[fc release];		// we don't need the initial reference now
+}
+
+//TODO- (void)delete:(uintmax_t)n
+
+- (int)isPadded
+{
+	return self->padded;
+}
+
+- (void)setPadded:(int)p
+{
+	CGFloat padding;
+	NSLayoutConstraint *c;
+
+	self->padded = p;
+	padding = [self paddingAmount];
+	for (c in self->inBetweens)
+		[c setConstant:-padding];
+	for (c in self->middles)
+		[c setConstant:-padding];
+}
+
+- (BOOL)hugsTrailing
+{
+	return YES;			// always hug trailing
+}
+
+- (BOOL)hugsBottom
+{
+	// only hug if we have stretchy
+	return self->nStretchy != 0;
+}
+
+@end
+
+static void uiFormDestroy(uiControl *c)
+{
+	uiForm *f = uiForm(c);
+
+	[f->view onDestroy];
+	[f->view release];
+	uiFreeControl(uiControl(f));
+}
+
+uiDarwinControlDefaultHandle(uiForm, view)
+uiDarwinControlDefaultParent(uiForm, view)
+uiDarwinControlDefaultSetParent(uiForm, view)
+uiDarwinControlDefaultToplevel(uiForm, view)
+uiDarwinControlDefaultVisible(uiForm, view)
+uiDarwinControlDefaultShow(uiForm, view)
+uiDarwinControlDefaultHide(uiForm, view)
+uiDarwinControlDefaultEnabled(uiForm, view)
+uiDarwinControlDefaultEnable(uiForm, view)
+uiDarwinControlDefaultDisable(uiForm, view)
+
+static void uiFormSyncEnableState(uiDarwinControl *c, int enabled)
+{
+	uiForm *f = uiForm(c);
+
+	if (uiDarwinShouldStopSyncEnableState(uiDarwinControl(f), enabled))
+		return;
+	[f->view syncEnableStates:enabled];
+}
+
+uiDarwinControlDefaultSetSuperview(uiForm, view)
+
+static BOOL uiFormHugsTrailingEdge(uiDarwinControl *c)
+{
+	uiForm *f = uiForm(c);
+
+	return [f->view hugsTrailing];
+}
+
+static BOOL uiFormHugsBottom(uiDarwinControl *c)
+{
+	uiForm *f = uiForm(c);
+
+	return [f->view hugsBottom];
+}
+
+static void uiFormChildEdgeHuggingChanged(uiDarwinControl *c)
+{
+	uiForm *f = uiForm(c);
+
+	[f->view establishOurConstraints];
+}
+
+uiDarwinControlDefaultHuggingPriority(uiForm, view)
+uiDarwinControlDefaultSetHuggingPriority(uiForm, view)
+
+void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy)
+{
+	// LONGTERM on other platforms
+	// or at leat allow this and implicitly turn it into a spacer
+	if (c == NULL)
+		userbug("You cannot add NULL to a uiForm.");
+	[f->view append:toNSString(label) c:c stretchy:stretchy];
+}
+
+int uiFormPadded(uiForm *f)
+{
+	return [f->view isPadded];
+}
+
+void uiFormSetPadded(uiForm *f, int padded)
+{
+	[f->view setPadded:padded];
+}
+
+uiForm *uiNewForm(void)
+{
+	uiForm *f;
+
+	uiDarwinNewControl(uiForm, f);
+
+	f->view = [[formView alloc] initWithF:f];
+
+	return f;
+}

darwin/label.m

@@ -18,18 +18,26 @@ void uiLabelSetText(uiLabel *l, const char *text)
 	[l->textfield setStringValue:toNSString(text)];
 }
 
+NSTextField *newLabel(NSString *str)
+{
+	NSTextField *tf;
+
+	tf = [[NSTextField alloc] initWithFrame:NSZeroRect];
+	[tf setStringValue:str];
+	[tf setEditable:NO];
+	[tf setSelectable:NO];
+	[tf setDrawsBackground:NO];
+	finishNewTextField(tf, NO);
+	return tf;
+}
+
 uiLabel *uiNewLabel(const char *text)
 {
 	uiLabel *l;
 
 	uiDarwinNewControl(uiLabel, l);
 
-	l->textfield = [[NSTextField alloc] initWithFrame:NSZeroRect];
-	[l->textfield setStringValue:toNSString(text)];
-	[l->textfield setEditable:NO];
-	[l->textfield setSelectable:NO];
-	[l->textfield setDrawsBackground:NO];
-	finishNewTextField(l->textfield, NO);
+	l->textfield = newLabel(toNSString(text));
 
 	return l;
 }

darwin/uipriv_darwin.h

@@ -120,3 +120,6 @@ struct scrollViewData;
 extern NSScrollView *mkScrollView(struct scrollViewCreateParams *p, struct scrollViewData **dout);
 extern void scrollViewSetScrolling(NSScrollView *sv, struct scrollViewData *d, BOOL hscroll, BOOL vscroll);
 extern void scrollViewFreeData(NSScrollView *sv, struct scrollViewData *d);
+
+// label.cpp
+extern NSTextField *newLabel(NSString *str);

ui.h

@@ -622,7 +622,7 @@ _UI_EXTERN uiColorButton *uiNewColorButton(void);
 
 typedef struct uiForm uiForm;
 #define uiForm(this) ((uiForm *) (this))
-_UI_EXTERN void uiFormAppend(uiForm *f, const char *label, uiControl *control, int stretchy);
+_UI_EXTERN void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy);
 _UI_EXTERN int uiFormPadded(uiForm *f);
 _UI_EXTERN void uiFormSetPadded(uiForm *f, int padded);
 _UI_EXTERN uiForm *uiNewForm(void);