moar chat moar

@@ -76,6 +76,20 @@ function math.triangle_area(p1, p2, p3)
 	return math.abs(0.5 * lu * lv * math.sin(av - au))
 end
 
+function math.find_closest_lower(x, list)
+	table.sort(list)
+	for i in ripairs_value(list) do
+		if x >= i then return i end
+	end
+end
+
+function math.find_closest_higher(x, list)
+	table.sort(list)
+	for i in ipairs_value(list) do
+		if x <= i then return i end
+	end
+end
+
 function lpeg.anywhere (p)
 	return lpeg.P{ p + 1 * lpeg.V(1) }
 end
@@ -134,6 +148,16 @@ function ipairs_value(t)
 	end
 end
 
+function ripairs_value(t)
+	local i = #t
+	return function()
+		if i == 0 then return nil end
+		local oi = i
+		i = i - 1
+		return t[oi], oi
+	end
+end
+
 function table.weak_keys(t)
 	t = t or {}
 	setmetatable(t, {__mode="k"})

@@ -51,7 +51,6 @@ function _M:makeUI()
 
 	-- Only for size info
 	local back = self:getUITexture("ui/portrait_frame_back.png")
-	local deco_down = self:getUITexture("ui/chat_ui_deco_padding_left_down.png")
 
 	self:loadUI(uis)
 	self:setFocus(self.c_list)
@@ -60,7 +59,15 @@ function _M:makeUI()
 		-- Ensure minimal height
 		if h + frameh < back.h then h = back.h - frameh end
 		-- Ensure if it's too big but too small to not have the down deco, to increase it a it
-		if h + frameh > back.h and h + frameh < back.h + deco_down.h / 2 then h = back.h - frameh + deco_down.h / 2 end
+		if h + frameh > back.h then
+			if h + frameh < back.h + 16 then h = back.h - frameh + 16 game.log("==adjusting to %d", 16)
+			elseif h + frameh < back.h + 32 then h = back.h - frameh + 32 game.log("==adjusting to %d", 32)
+			elseif h + frameh < back.h + 48 then h = back.h - frameh + 48 game.log("==adjusting to %d", 48)
+			elseif h + frameh < back.h + 64 then h = back.h - frameh + 64 game.log("==adjusting to %d", 64)
+			elseif h + frameh < back.h + 80 then h = back.h - frameh + 80 game.log("==adjusting to %d", 80)
+			end
+		end
+
 		self.force_x = game.w / 2 - w / 2
 		self.force_y = game.h - h - 20
 		return w, h

@@ -65,7 +65,11 @@ function _M:generate()
 
 	self.front = self:getUITexture("ui/portrait_frame_front.png")
 	self.back = self:getUITexture("ui/portrait_frame_back.png")
-	self.deco_down = self:getUITexture("ui/chat_ui_deco_padding_"..self.side.."_down.png")
+	self.deco_downs = {}
+	for i in ipairs_value{16, 32, 48, 64, 80} do
+		self.deco_downs[i] = self:getUITexture("ui/chat_ui_deco_padding_"..self.side.."_down_"..i..".png")
+	end
+	self.deco_down = nil
 	self.deco_up = self:getUITexture("ui/chat_ui_deco_padding_"..self.side.."_up.png")
 	self.w, self.h = self.front.w, self.front.h
 
@@ -83,20 +87,26 @@ end
 
 function _M:adjustHeight(h)
 	self.h_deco = h - self.back.h
+	local ch = math.find_closest_lower(self.h_deco, {16, 32, 48, 64, 80})
+	if not ch then
+		self.deco_down = nil
+	else
+		self.deco_down = self.deco_downs[ch]
+	end
 end
 
 function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 	local deco_x
-	if self.h_deco >= self.deco_up.h + self.deco_down.h then
+	if self.deco_down and self.h_deco >= self.deco_up.h + self.deco_down.h then
 		if self.side == "left" then deco_x = x + self.back.w - self.deco_up.w else deco_x = x end
 		self.deco_up.t:toScreenFull(deco_x, y, self.deco_up.w, self.deco_up.h, self.deco_up.tw, self.deco_up.th)
 		y = y + self.deco_up.h
 		screen_y = screen_y + self.deco_up.h
 	end
-	if self.h_deco >= 1 then
+	if self.deco_down then
 		if self.side == "left" then deco_x = x + self.back.w - self.deco_down.w else deco_x = x end
 		local deco_h = math.min(self.deco_down.h, self.h_deco)
-		self.deco_down.t:toScreenFull(deco_x, y + self.back.h, self.deco_down.w, deco_h, self.deco_down.tw, deco_h * self.deco_down.th / self.deco_down.h)
+		self.deco_down.t:toScreenFull(deco_x, y + self.back.h, self.deco_down.w, deco_h, self.deco_down.tw, self.deco_down.th)
 	end
 
 	self.back.t:toScreenFull(x, y, self.back.w, self.back.h, self.back.tw, self.back.th)