From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 19 Sep 2019 06:21:56 +0000 (+0300)
Subject: Use the maximum item height for autosizing List
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=commitdiff_plain;h=0eff24ae4db82ac5cadf7e59405e206284c1504c

Use the maximum item height for autosizing List
---

diff --git a/source/list.cpp b/source/list.cpp
index 5d179e1..005f6fa 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -71,18 +71,16 @@ void List::autosize_special(const Part &part, Geometry &ageom) const
 		const Sides &margin = part.get_margin();
 
 		unsigned max_w = 0;
-		unsigned total_h = 0;
+		unsigned max_h = 0;
 		for(unsigned i=0; i<items.size(); ++i)
 		{
 			Geometry igeom;
 			items[i]->autosize(igeom);
 			max_w = max(max_w, igeom.w);
-			if(view_size==0 || i<view_size)
-				total_h += igeom.h;
+			max_h = max(max_h, igeom.h);
 		}
 
-		if(!items.empty() && items.size()<view_size)
-			total_h = total_h*view_size/items.size();
+		unsigned total_h = max_h*(view_size==0 ? items.size() : view_size);
 
 		ageom.w = max(ageom.w, max_w+margin.left+margin.right);
 		ageom.h = max(ageom.h, total_h+margin.top+margin.bottom);