shithub: libnate

Download patch

ref: 1890aeca379976e46deabb0ce844aefc8be1a2c5
parent: 7d7806db6cd48b8ebd565f636eebc59939e72c53
author: sirjofri <sirjofri@sirjofri.de>
date: Sun Feb 9 16:59:04 EST 2025 

s/SizeToContent/AutoSize/g, adds AutoWidth/AutoHeight


--- a/n_box.c
+++ b/n_box.c
@@ -14,7 +14,7 @@
 	NBox* b = (NBox*)nelem;
 	GUARD(b);
 	Nelem *child = lgetfirst(&b->children);
-	if (!b->sizetocontent) {
+	if (!b->autosize) {
 		r.max = addpt(r.min, b->size);
 		/* tell child its size (important!) */
 		ncallcalcsize(child, screen, r);
@@ -43,7 +43,7 @@
 		return;
 
 	r = b->r;
-	if (b->sizetocontent) {
+	if (b->autosize) {
 		r = b->r;
 	} else {
 		r = b->r;
@@ -126,7 +126,7 @@
 DEF_SLOTFUNC(NBox, box_slot);
 
 DEF_ACCESSOR_TwoParams(NBox, box_border, int, borderwidth, Image*, bordercolor);
-DEF_ACCESSOR_OneParam(NBox, box_sizetocontent, int, sizetocontent);
+DEF_ACCESSOR_OneParam(NBox, box_autosize, int, autosize);
 DEF_ACCESSOR_OneParam(NBox, box_size, Point, size);
 DEF_ACCESSOR_OneParam(NBox, box_padding, Nmargin, padding);
 DEF_ACCESSOR_TwoParams(NBox, box_onclick, OnclickHandler, hitfunc, void*, hitaux);
@@ -138,12 +138,12 @@
 	
 	b->Slot = box_slot;
 	b->Border = box_border;
-	b->SizeToContent = box_sizetocontent;
+	b->AutoSize = box_autosize;
 	b->Size = box_size;
 	b->OnClick = box_onclick;
 	b->Padding = box_padding;
 	
-	b->sizetocontent = 0;
+	b->autosize = 0;
 	b->size = ZP;
 	b->hitfunc = nil;
 	b->hitaux = nil;
--- a/n_box.h
+++ b/n_box.h
@@ -5,7 +5,7 @@
 	Nelem;
 	DECL_ACCESSOR_OneParam(NBox, Slot, Nelem*);
 	DECL_ACCESSOR_TwoParams(NBox, Border, int, Image*);
-	DECL_ACCESSOR_OneParam(NBox, SizeToContent, int);
+	DECL_ACCESSOR_OneParam(NBox, AutoSize, int);
 	DECL_ACCESSOR_OneParam(NBox, Size, Point);
 	DECL_ACCESSOR_TwoParams(NBox, OnClick, OnclickHandler, void*);
 	DECL_ACCESSOR_OneParam(NBox, Padding, Nmargin);
@@ -12,7 +12,7 @@
 	
 	// private members
 	Point size;
-	int sizetocontent;
+	int autosize;
 	int borderwidth;
 	Nmargin padding;
 	Image* bordercolor;
--- a/n_button.c
+++ b/n_button.c
@@ -87,12 +87,12 @@
 }
 
 static NButton*
-button_sizetocontent(int n)
+button_autosize(int n)
 {
 	NButton *c = (NButton*)nc_get();
 	GUARD(c);
 	nc_push(c->box);
-	c->box->SizeToContent(n);
+	c->box->AutoSize(n);
 	nc_pop();
 	return c;
 }
@@ -142,7 +142,7 @@
 	
 	b->Slot = button_slot;
 	b->Border = button_border;
-	b->SizeToContent = button_sizetocontent;
+	b->AutoSize = button_autosize;
 	b->OnClick = button_onclick;
 	
 	b->Label = button_label;
--- a/n_button.h
+++ b/n_button.h
@@ -5,7 +5,7 @@
 	Nelem;
 	DECL_ACCESSOR_OneParam(NButton, Slot, Nelem*);
 	DECL_ACCESSOR_TwoParams(NButton, Border, int, Image*);
-	DECL_ACCESSOR_OneParam(NButton, SizeToContent, int);
+	DECL_ACCESSOR_OneParam(NButton, AutoSize, int);
 	DECL_ACCESSOR_TwoParams(NButton, OnClick, OnclickHandler, void*);
 	
 	DECL_ACCESSOR_OneParam(NButton, Label, char*);
--- a/n_hbox.c
+++ b/n_hbox.c
@@ -34,7 +34,8 @@
 	params.screen = screen;
 	params.crect = r;
 	params.frect.min = r.min;
-	params.frect.max = r.min;
+	params.frect.max.x = r.min.x;
+	params.frect.max.y = b->autoheight ? r.min.y : r.max.y;
 	
 	lforeach(&b->children, hbox_childsize, &params);
 
@@ -45,7 +46,6 @@
 static void
 hbox_childdraw(Nelem* elem, int, void *aux)
 {
-	
 	ncalldraw(elem, (Image*)aux);
 }
 
@@ -56,10 +56,6 @@
 	GUARD(b);
 	
 	lforeach(&b->children, hbox_childdraw, img);
-	
-	if (nateborders) {
-		border(img, b->r, 1, ncolor.red, ZP);
-	}
 }
 
 static Nelemfunctions Nhboxfunctions = {
@@ -69,7 +65,7 @@
 
 DEF_SLOTFUNC(NHBox, hbox_slot);
 
-DEF_ACCESSOR_OneParam(NHBox, hbox_sizetocontent, int, sizetocontent);
+DEF_ACCESSOR_OneParam(NHBox, hbox_autoheight, int, autoheight);
 
 NHBox*
 New_HBox(char *name)
@@ -77,10 +73,10 @@
 	NHBox *b = MakeNelem(NHBox, NHBox_Type, &Nhboxfunctions, name, -1);
 	
 	b->Slot = hbox_slot;
-	b->SizeToContent = hbox_sizetocontent;
+	b->AutoHeight = hbox_autoheight;
 	
 	linit(&b->children);
-	b->sizetocontent = 0;
+	b->autoheight = 0;
 	nc_push(b);
 	return b;
 }
--- a/n_hbox.h
+++ b/n_hbox.h
@@ -4,10 +4,10 @@
 struct NHBox {
 	Nelem;
 	DECL_ACCESSOR_OneParam(NHBox, Slot, Nelem*);
-	DECL_ACCESSOR_OneParam(NHBox, SizeToContent, int);
+	DECL_ACCESSOR_OneParam(NHBox, AutoHeight, int);
 	
 	// private members
-	int sizetocontent;
+	int autoheight;
 };
 
 NHBox* New_HBox(char*);
--- a/n_vbox.c
+++ b/n_vbox.c
@@ -34,7 +34,8 @@
 	params.crect = r;
 	params.screen = img;
 	params.frect.min = r.min;
-	params.frect.max = r.min;
+	params.frect.max.x = b->autowidth ? r.min.x : r.max.x;
+	params.frect.max.y = r.min.y;
 	
 	lforeach(&b->children, vbox_childsize, &params);
 	
@@ -64,7 +65,7 @@
 
 DEF_SLOTFUNC(NVBox, vbox_slot);
 
-DEF_ACCESSOR_OneParam(NVBox, vbox_sizetocontent, int, sizetocontent);
+DEF_ACCESSOR_OneParam(NVBox, vbox_autowidth, int, autowidth);
 
 NVBox*
 New_VBox(char *name)
@@ -72,10 +73,10 @@
 	NVBox *b = MakeNelem(NVBox, NVBox_Type, &Nvboxfunctions, name, -1);
 	
 	b->Slot = vbox_slot;
-	b->SizeToContent = vbox_sizetocontent;
+	b->AutoWidth = vbox_autowidth;
 	
 	linit(&b->children);
-	b->sizetocontent = 0;
+	b->autowidth = 0;
 	nc_push(b);
 	return b;
 }
--- a/n_vbox.h
+++ b/n_vbox.h
@@ -4,10 +4,10 @@
 struct NVBox {
 	Nelem;
 	DECL_ACCESSOR_OneParam(NVBox, Slot, Nelem*);
-	DECL_ACCESSOR_OneParam(NVBox, SizeToContent, int);
+	DECL_ACCESSOR_OneParam(NVBox, AutoWidth, int);
 	
 	// private members
-	int sizetocontent;
+	int autowidth;
 };
 
 NVBox* New_VBox(char*);
--- a/nate.c
+++ b/nate.c
@@ -207,9 +207,11 @@
 		if (natetracedraw && natedebugfd >= 0)
 			fprint(natedebugfd, "DRAW: %s\n", nelem->type);
 		or = dst->clipr;
-		//replclipr(dst, 0, nelem->r);
+		replclipr(dst, 0, nelem->r);
 		nelem->funcs->draw(nelem, dst);
-		//replclipr(dst, 0, or);
+		replclipr(dst, 0, or);
+		if (nateborders)
+			border(dst, nelem->r, 1, ncolor.red, ZP);
 	}
 }
 
--- a/test/ntest.c
+++ b/test/ntest.c
@@ -80,14 +80,14 @@
 	->MakeRoot()
 	->Slot(
 		New_VBox(nil)
-		->SizeToContent(1)
+		->AutoWidth(1)
 		->Slot(
 			New_HBox("first")
-			->SizeToContent(1)
+			->AutoHeight(1)
 			->Slot(
 				NAssign(NBox, &box1, New_Box(nil))
 				->Border(1, green)
-				->SizeToContent(1)
+				->AutoSize(1)
 				->Padding(NMargin2(5, 3))
 				->OnClick(callclick, nil)
 				->Slot(
@@ -99,7 +99,7 @@
 			->Slot(
 				NAssign(NBox, &box2, New_Box(nil))
 				->Border(1, blue)
-				->SizeToContent(1)
+				->AutoSize(1)
 				->OnClick(callclick, nil)
 				->Slot(
 					New_Label(nil)
@@ -118,7 +118,7 @@
 		)
 		->Slot(
 			New_HBox("second")
-			->SizeToContent(1)
+			->AutoHeight(1)
 			->Slot(
 				New_Label(nil)
 				->Label("abc")