Merge branch 'master' of ssh://gitea.nishi.boats:2222/pyrite-dev/milsko

milsko.xml

@@ -526,6 +526,7 @@
 				<property name="pixmap" />
 				<property name="hasBorder" />
 				<property name="inverted" />
+				<property name="fillArea" />
 			</properties>
 		</widget>
 		<widget name="Label">

src/core.c

@@ -693,7 +693,7 @@ static void force_render_all(MwWidget handle) {
 	for(i = 0; i < arrlen(handle->children); i++) {
 		force_render_all(handle->children[i]);
 	}
-	MwForceRender(handle);
+	if(handle->lowlevel != NULL) MwForceRender(handle);
 }
 
 void MwToggleDarkTheme(MwWidget handle, int toggle) {

src/widget/box.c

@@ -58,7 +58,6 @@ static void layout(MwWidget handle) {
 		} else {
 			wsz = sz * n / sum;
 		}
-		wsz -= Margin;
 
 		MwVaApply(handle->children[i],
 			  horiz ? MwNx : MwNy, sk,				 /* this is what gets changed */

src/widget/image.c

@@ -5,6 +5,7 @@ static int create(MwWidget handle) {
 
 	MwSetInteger(handle, MwNhasBorder, 0);
 	MwSetInteger(handle, MwNinverted, 1);
+	MwSetInteger(handle, MwNfillArea, 1);
 
 	return 0;
 }
@@ -23,6 +24,13 @@ static void draw(MwWidget handle) {
 
 	MwDrawRect(handle, &r, base);
 	if(px != NULL) {
+		if(!MwGetInteger(handle, MwNfillArea)) {
+			r.x	 = (r.width - px->common.width) / 2;
+			r.y	 = (r.height - px->common.height) / 2;
+			r.width	 = px->common.width;
+			r.height = px->common.height;
+		}
+
 		MwLLDrawPixmap(handle->lowlevel, &r, px);
 	}