Merge branch 'master' of github.com:andlabs/libui

darwin/form.m

@@ -39,7 +39,7 @@
 - (CGFloat)paddingAmount;
 - (void)establishOurConstraints;
 - (void)append:(NSString *)label c:(uiControl *)c stretchy:(int)stretchy;
-//TODO- (void)delete:(int)n;
+- (void)delete:(int)n;
 - (int)isPadded;
 - (void)setPadded:(int)p;
 - (BOOL)hugsTrailing;
@@ -394,7 +394,30 @@ struct uiForm {
 	[fc release];		// we don't need the initial reference now
 }
 
-//TODO- (void)delete:(int)n
+- (void)delete:(int)n
+{
+	formChild *fc;
+	int stretchy;
+
+	fc = (formChild *) [self->children objectAtIndex:n];
+	stretchy = fc.stretchy;
+
+	uiControlSetParent(fc.c, NULL);
+	uiDarwinControlSetSuperview(uiDarwinControl(fc.c), nil);
+
+	uiDarwinControlSetHuggingPriority(uiDarwinControl(fc.c), fc.oldHorzHuggingPri, NSLayoutConstraintOrientationHorizontal);
+	uiDarwinControlSetHuggingPriority(uiDarwinControl(fc.c), fc.oldVertHuggingPri, NSLayoutConstraintOrientationVertical);
+
+	[fc.label removeFromSuperview];
+
+	[self->children removeObjectAtIndex:n];
+
+	[self establishOurConstraints];
+	if (stretchy) {
+		if ([self nStretchy] == 0)
+			uiDarwinNotifyEdgeHuggingChanged(uiDarwinControl(self->f));
+	}
+}
 
 - (int)isPadded
 {
@@ -513,6 +536,11 @@ void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy)
 	[f->view append:toNSString(label) c:c stretchy:stretchy];
 }
 
+void uiFormDelete(uiForm *f, int n)
+{
+	[f->view delete:n];
+}
+
 int uiFormPadded(uiForm *f)
 {
 	return [f->view isPadded];

ui.h

@@ -625,6 +625,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 *c, int stretchy);
+_UI_EXTERN void uiFormDelete(uiForm *f, int index);
 _UI_EXTERN int uiFormPadded(uiForm *f);
 _UI_EXTERN void uiFormSetPadded(uiForm *f, int padded);
 _UI_EXTERN uiForm *uiNewForm(void);

unix/form.c

@@ -3,6 +3,7 @@
 
 struct formChild {
 	uiControl *c;
+	int stretchy;
 	GtkWidget *label;
 	gboolean oldhexpand;
 	GtkAlign oldhalign;
@@ -55,6 +56,7 @@ void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy)
 
 	fc.c = c;
 	widget = GTK_WIDGET(uiControlHandle(fc.c));
+	fc.stretchy = stretchy;
 	fc.oldhexpand = gtk_widget_get_hexpand(widget);
 	fc.oldhalign = gtk_widget_get_halign(widget);
 	fc.oldvexpand = gtk_widget_get_vexpand(widget);
@@ -99,6 +101,29 @@ void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy)
 		NULL);
 }
 
+void uiFormDelete(uiForm *f, int index)
+{
+	struct formChild *fc;
+	GtkWidget *widget;
+
+	fc = ctrl(f, index);
+	widget = GTK_WIDGET(uiControlHandle(fc->c));
+
+	gtk_widget_destroy(fc->label);
+
+	uiControlSetParent(fc->c, NULL);
+	uiUnixControlSetContainer(uiUnixControl(fc->c), f->container, TRUE);
+
+	if (fc->stretchy)
+		gtk_size_group_remove_widget(f->stretchygroup, widget);
+	gtk_widget_set_hexpand(widget, fc->oldhexpand);
+	gtk_widget_set_halign(widget, fc->oldhalign);
+	gtk_widget_set_vexpand(widget, fc->oldvexpand);
+	gtk_widget_set_valign(widget, fc->oldvalign);
+
+	g_array_remove_index(f->children, index);
+}
+
 int uiFormPadded(uiForm *f)
 {
 	return f->padded;

windows/form.cpp

@@ -276,6 +276,18 @@ void uiFormAppend(uiForm *f, const char *label, uiControl *c, int stretchy)
 	uiWindowsControlMinimumSizeChanged(uiWindowsControl(f));
 }
 
+void uiFormDelete(uiForm *f, int index)
+{
+	uiControl *c;
+
+	c = (*(f->controls))[index].c;
+	uiControlSetParent(c, NULL);
+	uiWindowsControlSetParentHWND(uiWindowsControl(c), NULL);
+	f->controls->erase(f->controls->begin() + index);
+	formArrangeChildren(f);
+	uiWindowsControlMinimumSizeChanged(uiWindowsControl(f));
+}
+
 int uiFormPadded(uiForm *f)
 {
 	return f->padded;