Exit early if all items are inflexible

DRKV333 · tordex · commit b03d570c09b1 · 2025-09-10T00:45:40.000+03:00
diff --git a/src/flex_line.cpp b/src/flex_line.cpp
@@ -21,6 +21,8 @@ void litehtml::flex_line::distribute_free_space_grow(pixel_t container_main_size
 {
 	pixel_t initial_free_space = container_main_size;
 
+	bool all_inflexible = true;
+
 	for (auto& item : items)
 	{
 		// 2. Size inflexible items. Freeze, setting its target main size to its hypothetical main size
@@ -39,14 +41,17 @@ void litehtml::flex_line::distribute_free_space_grow(pixel_t container_main_size
 		} else
 		{
 			initial_free_space -= item->base_size;
+			all_inflexible = false;
 		}
 	}
 
 	// 4. Loop:
 
 	// 4.a Check for flexible items. If all the flex items on the line are frozen, free space has been
 	// distributed; exit this loop.
-	
+
+	if (all_inflexible) return;
+
 	while (true)
 	{
 		// 4.b Calculate the remaining free space as for initial free space, above. If the sum of the
@@ -107,6 +112,8 @@ void litehtml::flex_line::distribute_free_space_shrink(pixel_t container_main_si
 {
 	pixel_t initial_free_space = container_main_size;
 
+	bool all_inflexible = true;
+
 	for (auto& item : items)
 	{
 		// 2. Size inflexible items. Freeze, setting its target main size to its hypothetical main size
@@ -125,14 +132,17 @@ void litehtml::flex_line::distribute_free_space_shrink(pixel_t container_main_si
 		} else
 		{
 			initial_free_space -= item->base_size;
+			all_inflexible = false;
 		}
 	}
 
 	// 4. Loop:
 
 	// 4.a Check for flexible items. If all the flex items on the line are frozen, free space has been
 	// distributed; exit this loop.
-	
+
+	if (all_inflexible) return;
+
 	while (true)
 	{
 		// 4.b Calculate the remaining free space as for initial free space, above. If the sum of the

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ void litehtml::flex_line::distribute_free_space_grow(pixel_t container_main_size`
`21`	`21`	`{`
`22`	`22`	`pixel_t initial_free_space = container_main_size;`
`23`	`23`
	`24`	`+ bool all_inflexible = true;`
	`25`	`+`
`24`	`26`	`for (auto& item : items)`
`25`	`27`	`{`
`26`	`28`	`// 2. Size inflexible items. Freeze, setting its target main size to its hypothetical main size`
`@@ -39,14 +41,17 @@ void litehtml::flex_line::distribute_free_space_grow(pixel_t container_main_size`
`39`	`41`	`} else`
`40`	`42`	`{`
`41`	`43`	`initial_free_space -= item->base_size;`
	`44`	`+ all_inflexible = false;`
`42`	`45`	`}`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`// 4. Loop:`
`46`	`49`
`47`	`50`	`// 4.a Check for flexible items. If all the flex items on the line are frozen, free space has been`
`48`	`51`	`// distributed; exit this loop.`
`49`		`-`
	`52`	`+`
	`53`	`+ if (all_inflexible) return;`
	`54`	`+`
`50`	`55`	`while (true)`
`51`	`56`	`{`
`52`	`57`	`// 4.b Calculate the remaining free space as for initial free space, above. If the sum of the`
`@@ -107,6 +112,8 @@ void litehtml::flex_line::distribute_free_space_shrink(pixel_t container_main_si`
`107`	`112`	`{`
`108`	`113`	`pixel_t initial_free_space = container_main_size;`
`109`	`114`
	`115`	`+ bool all_inflexible = true;`
	`116`	`+`
`110`	`117`	`for (auto& item : items)`
`111`	`118`	`{`
`112`	`119`	`// 2. Size inflexible items. Freeze, setting its target main size to its hypothetical main size`
`@@ -125,14 +132,17 @@ void litehtml::flex_line::distribute_free_space_shrink(pixel_t container_main_si`
`125`	`132`	`} else`
`126`	`133`	`{`
`127`	`134`	`initial_free_space -= item->base_size;`
	`135`	`+ all_inflexible = false;`
`128`	`136`	`}`
`129`	`137`	`}`
`130`	`138`
`131`	`139`	`// 4. Loop:`
`132`	`140`
`133`	`141`	`// 4.a Check for flexible items. If all the flex items on the line are frozen, free space has been`
`134`	`142`	`// distributed; exit this loop.`
`135`		`-`
	`143`	`+`
	`144`	`+ if (all_inflexible) return;`
	`145`	`+`
`136`	`146`	`while (true)`
`137`	`147`	`{`
`138`	`148`	`// 4.b Calculate the remaining free space as for initial free space, above. If the sum of the`