shithub: libnate

Download patch

ref: 855a60a7698acb993b68f8e64448bd2fc3ff86da
parent: 69e287559e1faed50092d64659c5bc02f9bf395c
author: sirjofri <sirjofri@sirjofri.de>
date: Tue Mar 25 10:33:36 EDT 2025 

improves slot handling


--- a/n_box.c
+++ b/n_box.c
@@ -15,19 +15,32 @@
 	NBox* b = (NBox*)nelem;
 	GUARD(b);
 	
-	if (!b->autosize && b->size.x >= 0 && b->size.y >= 0)
-		r.max = addpt(r.min, b->size);
-	
 	Nelem *child = lgetfirst(&b->children);
+	cr.min = r.min;
+	if (b->size.x >= 0 && b->size.y >= 0) {
+		cr.max = addpt(cr.min, Pt(b->size.x, b->size.y));
+	} else
 	if (child) {
-		if (b->autosize)
-			r.max = addpt(r.min, ncalldesiredsize(child, screen));
-		
-		/* tell child its size (important!) */
-		cr = insetrect(r, b->borderwidth);
+		cr.max = addpt(cr.min, ncalldesiredsize(child, screen));
+		cr.max.x += 2*b->borderwidth;
+		cr.max.y += 2*b->borderwidth;
+	} else {
+		cr.max = addpt(r.min, Pt(2*b->borderwidth, 2*b->borderwidth));
+	}
+	cr = extendmargin(cr, b->padding);
+	
+	if (b->slot.fill&FILLX)
+		cr.max.x = r.max.x;
+	if (b->slot.fill&FILLY)
+		cr.max.y = r.max.y;
+	
+	b->slot.r = cr;
+	
+	/* tell child its size (important!) */
+	if (child) {
+		cr = insetmargin(insetrect(cr, b->borderwidth), b->padding);
 		ncallcalcrect(child, screen, cr);
 	}
-	b->slot.r = r;
 	return b->slot.r;
 }
 
@@ -35,21 +48,19 @@
 box_desiredsize(Nelem *nelem, Image *screen)
 {
 	Point pt;
+	Nelem *child;
 	NBox *b = (NBox*)nelem;
 	GUARD(b);
 	
-	if (b->autosize) {
-		Nelem *child = lgetfirst(&b->children);
-		if (child)
-			pt = ncalldesiredsize(child, screen);
-		pt.x += 2*b->borderwidth;
-		pt.y += 2*b->borderwidth;
-		return pt;
-	}
-	if (b->size.x < 0 || b->size.y < 0)
-		sysfatal("error: box size < 0: %s %s", b->type, b->name);
+	if (b->size.x >= 0 && b->size.y >= 0)
+		return b->size;
 	
-	return b->size;
+	child = lgetfirst(&b->children);
+	if (child)
+		pt = ncalldesiredsize(child, screen);
+	pt.x += 2*b->borderwidth + b->padding.left + b->padding.right;
+	pt.y += 2*b->borderwidth + b->padding.top + b->padding.bottom;
+	return pt;
 }
 
 static void
--- a/n_button.c
+++ b/n_button.c
@@ -15,6 +15,7 @@
 {
 	NButton *b = (NButton*)nelem;
 	GUARD(b);
+	b->box->slot = b->slot;
 	b->slot.r = ncallcalcrect(b->box, screen, r);
 	return b->slot.r;
 }
@@ -24,6 +25,7 @@
 {
 	NButton *b = (NButton*)nelem;
 	GUARD(b);
+	b->box->slot = b->slot;
 	return ncalldesiredsize(b->box, screen);
 }
 
@@ -32,6 +34,7 @@
 {
 	NButton *b = (NButton*)nelem;
 	GUARD(b);
+	b->box->slot = b->slot;
 	ncalldraw(b->box, img);
 }
 
@@ -40,6 +43,7 @@
 {
 	NButton *b = (NButton*)nelem;
 	GUARD(b);
+	b->box->slot = b->slot;
 	return ncallcheckhit(b->box, screen, m);
 }
 
--- a/n_hbox.c
+++ b/n_hbox.c
@@ -23,8 +23,7 @@
 	Rectangle r;
 	csizep *p = (csizep*)aux;
 	
-	/* only call if no fill at all */
-	if (!nelem->slot.fill)
+	if (!nelem->slot.fill&FILLX || !nelem->slot.fill&FILLY)
 		pt = ncalldesiredsize(nelem, p->screen);
 	
 	if (nelem->slot.fill&FILLX)
@@ -50,7 +49,7 @@
 {
 	Point pt;
 	dprepassp *p = (dprepassp*)aux;
-	if (nelem->slot.fill & FILLX) {
+	if (nelem->slot.fill&FILLX) {
 		p->numfill++;
 		return;
 	}
@@ -74,10 +73,12 @@
 	
 	lforeach(&b->children, sizeprepass, &pp);
 	
-	cp.screen = screen;
 	cp.crect = r;
+	cp.screen = screen;
 	cp.fillheight = Dy(r);
-	cp.autowidth = (Dx(r) - pp.fixedwidth) / pp.numfill;
+	cp.autowidth = Dx(r) - pp.fixedwidth;
+	if (pp.numfill)
+		cp.autowidth /= pp.numfill;
 	
 	lforeach(&b->children, childsize, &cp);
 
@@ -93,12 +94,12 @@
 static void
 dsizechild(Nelem *el, int, void *aux)
 {
-	Point t;
+	Point pt;
 	cdsizep *p = (cdsizep*)aux;
-	t = ncalldesiredsize(el, p->screen);
-	if (t.y > p->size.y)
-		p->size.y = t.y;
-	p->size.x += t.x;
+	pt = ncalldesiredsize(el, p->screen);
+	if (pt.y > p->size.y)
+		p->size.y = pt.y;
+	p->size.x += pt.x;
 }
 
 static Point
--- a/n_vbox.c
+++ b/n_vbox.c
@@ -23,8 +23,7 @@
 	Rectangle r;
 	csizep *p = (csizep*)aux;
 	
-	/* only call if no fill at all */
-	if (!nelem->slot.fill)
+	if (!nelem->slot.fill&FILLX || !nelem->slot.fill&FILLY)
 		pt = ncalldesiredsize(nelem, p->screen);
 	
 	if (nelem->slot.fill&FILLX)
@@ -48,13 +47,14 @@
 static void
 sizeprepass(Nelem *nelem, int, void *aux)
 {
+	Point pt;
 	dprepassp *p = (dprepassp*)aux;
-	if (nelem->slot.fill & FILLY) {
+	if (nelem->slot.fill&FILLY) {
 		p->numfill++;
 		return;
 	}
-	Rectangle r = ncalldesiredsize(nelem, p->screen);
-	p->fixedheight += Dy(r);
+	pt = ncalldesiredsize(nelem, p->screen);
+	p->fixedheight += pt.y;
 }
 
 static Rectangle
@@ -76,8 +76,12 @@
 	cp.crect = r;
 	cp.screen = img;
 	cp.fillwidth = Dx(r);
-	cp.autoheight = (Dy(r) - pp.fixedheight) / pp.numfill;
+	cp.autoheight = Dy(r) - pp.fixedheight;
+	if (pp.numfill)
+		cp.autoheight /= pp.numfill;
 	
+	// TODO: check if numfill is correct!
+	
 	lforeach(&b->children, childsize, &cp);
 	
 	return b->slot.r;
@@ -92,12 +96,12 @@
 static void
 dsizechild(Nelem *el, int, void *aux)
 {
-	Point t;
+	Point pt;
 	cdsizep *p = (cdsizep*)aux;
-	t = ncalldesiredsize(el, p->screen);
-	if (t.x > p->size.x)
-		p->size.x = t.x;
-	p->size.y += t.y;
+	pt = ncalldesiredsize(el, p->screen);
+	if (pt.x > p->size.x)
+		p->size.x = pt.x;
+	p->size.y += pt.y;
 }
 
 static Point
--- a/nate.c
+++ b/nate.c
@@ -335,3 +335,30 @@
 	s.fill = FILLX|FILLY;
 	return s;
 }
+
+Nslot
+NSlotx(Nalign a, int f)
+{
+	Nslot s;
+	s.align = a;
+	s.fill = f;
+	return s;
+}
+
+Rectangle
+insetmargin(Rectangle r, Nmargin i)
+{
+	r.min.x += i.left;
+	r.min.y += i.top;
+	r.max.x -= i.right;
+	r.max.y -= i.bottom;
+	return r;
+}
+
+Rectangle
+extendmargin(Rectangle r, Nmargin i)
+{
+	r.max.x += i.right + i.left;
+	r.max.y += i.bottom + i.top;
+	return r;
+}
--- a/nate.h
+++ b/nate.h
@@ -50,6 +50,9 @@
 #define NMargin(l, t, r, b) ((Nmargin){l, t, r, b})
 #define NMargin2(x, y) ((Nmargin){x, y, x, y})
 
+Rectangle insetmargin(Rectangle, Nmargin);
+Rectangle extendmargin(Rectangle, Nmargin);
+
 /******************/
 /* user functions */
 /******************/
@@ -89,6 +92,7 @@
 };
 
 Nslot NSlot(void);
+Nslot NSlotx(Nalign, int);
 
 struct Nelem {
 	char *type;
--- a/nate_construct.c
+++ b/nate_construct.c
@@ -69,8 +69,6 @@
 	if (p->retelem)
 		return;
 	
-	border(p->screen, r, 1, ncolor.green, ZP);
-	
 	if (!ptinrect(p->mouse.xy, elem->slot.r))
 		return;
 	
--- a/test/ntest.c
+++ b/test/ntest.c
@@ -10,6 +10,11 @@
 #include "../n_label.h"
 #include "../n_image.h"
 
+//#define T_VBOX
+//#define T_HBOX
+#define T_BOX
+//#define T_GRID
+
 char*
 getlabel(void)
 {
@@ -76,13 +81,128 @@
 	Image* green = allocimage(display, Rect(0, 0, 1, 1), screen->chan, 1, DGreen);
 	Image* blue = allocimage(display, Rect(0, 0, 1, 1), screen->chan, 1, DBlue);
 	
+#ifdef T_VBOX
 	NAssign(NWindow, &mainwindow, New_Window("window"))
 	->MakeRoot()
 	->Slot(NSlot(),
+		New_VBox("vbox")
+		->Slot(NSlot(),
+			New_Label("first_label")
+			->Label("first")
+		)
+		->Slot(NSlot(),
+			New_Label("second_label")
+			->Label("second")
+		)
+	);
+#endif
+
+#ifdef T_HBOX
+	NAssign(NWindow, &mainwindow, New_Window("window"))
+	->MakeRoot()
+	->Slot(NSlot(),
+		New_HBox("hbox")
+		->Slot(NSlot(),
+			New_Label("first_label")
+			->Label("first")
+		)
+		->Slot(NSlot(),
+			New_Label("second_label")
+			->Label("second")
+		)
+	);
+#endif
+
+#ifdef T_GRID
+	NAssign(NWindow, &mainwindow, New_Window("window"))
+	->MakeRoot()
+	->Slot(NSlot(),
+		New_VBox("vbox")
+		->Slot(NSlot(),
+			New_HBox("hbox1")
+			->Slot(NSlot(),
+				New_Label("l1")
+				->Label("first")
+			)
+			->Slot(NSlot(),
+				New_Label("l2")
+				->Label("second")
+			)
+		)
+		->Slot(NSlot(),
+			New_HBox("hbox2")
+			->Slot(NSlot(),
+				New_Label("l3")
+				->Label("third")
+			)
+			->Slot(NSlot(),
+				New_Label("l4")
+				->Label("fourth")
+			)
+		)
+	);
+#endif
+
+#ifdef T_BOX
+	NAssign(NWindow, &mainwindow, New_Window("window"))
+	->MakeRoot()
+	->Slot(NSlot(),
+		New_HBox("hbox")
+		->Slot(NSlot(),
+			New_Box("fillbox")
+			->Border(5, green)
+			->Size(Pt(100, 100))
+			->Padding(NMargin2(5, 5))
+			->Slot(NSlot(),
+				New_Label(nil)
+				->Label("fill")
+				->Align(CENTER)
+			)
+		)
+		->Slot(NSlotx(LEFT, 0),
+			New_Box("nofillbox")
+			->Border(5, green)
+			->Size(Pt(100, 100))
+			->Padding(NMargin2(5, 5))
+			->Slot(NSlot(),
+				New_Label(nil)
+				->Label("nofill")
+				->Align(CENTER)
+			)
+		)
+		->Slot(NSlotx(LEFT, FILLX),
+			New_Box("fillxbox")
+			->Border(5, green)
+			->Size(Pt(100, 100))
+			->Padding(NMargin2(5, 5))
+			->Slot(NSlot(),
+				New_Label(nil)
+				->Label("fillx")
+				->Align(CENTER)
+			)
+		)
+		->Slot(NSlotx(LEFT, FILLY),
+			New_Box("fillybox")
+			->Border(5, green)
+			->Size(Pt(100, 100))
+			->Padding(NMargin2(5, 5))
+			->Slot(NSlot(),
+				New_Label(nil)
+				->Label("filly")
+				->Align(CENTER)
+			)
+		)
+	);
+#endif
+
+	/*
+	NAssign(NWindow, &mainwindow, New_Window("window"))
+	->MakeRoot()
+	->Slot(NSlot(),
 		New_VBox("outer_vbox")
 		->Slot(NSlot(),
 			New_HBox("first_hbox")
-			->Slot(NSlot(),
+			->Slot(NSlotx(LEFT, FILLX),
 				NAssign(NBox, &box1, New_Box("first_box"))
 				->Border(1, green)
 				->AutoSize(1)
@@ -94,7 +214,7 @@
 					->Margin(NMargin2(5, 5))
 				)
 			)
-			->Slot(NSlot(),
+			->Slot(NSlotx(LEFT, FILLX),
 				NAssign(NBox, &box2, New_Box("second_box"))
 				->Border(1, blue)
 				->OnClick(callclick, nil)
@@ -105,7 +225,7 @@
 					->Margin(NMargin2(5, 5))
 				)
 			)
-			->Slot(NSlot(),
+			->Slot(NSlotx(LEFT, FILLX),
 				New_Box("image_box")
 				->Size(Pt(50, 50))
 				->Slot(NSlot(),
@@ -114,7 +234,7 @@
 				)
 			)
 		)
-		->Slot(NSlot(),
+		->Slot(NSlotx(LEFT, FILLX),
 			New_HBox("second_hbox")
 			->Slot(NSlot(),
 				New_Label("third_label")
@@ -122,6 +242,7 @@
 			)
 		)
 	);
+	*/
 	
 	eresized(0);