Fix auto-sizing

wolf81 · Apr 16, 2024 · 995744a · 995744a
1 parent 160a977
commit 995744a
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/composer/layout.lua b/composer/layout.lua
@@ -185,7 +185,15 @@ local HStack = {}
 HStack.__index = HStack
 
 function HStack:new(...)
-	local this = Layout.new(self, ...)
+	local args = { ... }
+
+	local stretch = F.removeMatch(args, function(v) 
+		return getmetatable(v) == Stretch
+	end)
+
+	stretch = stretch or Stretch(1, 0)
+
+	local this = Layout.new(self, stretch, ...)
 
 	return setmetatable(this, HStack)
 end
@@ -244,7 +252,15 @@ local VStack = {}
 VStack.__index = VStack
 
 function VStack:new(...)
-	local this = Layout.new(self, ...)
+	local args = { ... }
+
+	local stretch = F.removeMatch(args, function(v) 
+		return getmetatable(v) == Stretch
+	end)
+
+	stretch = stretch or Stretch(0, 1)
+
+	local this = Layout.new(self, stretch, ...)
 
 	return setmetatable(this, VStack)
 end