From 9faf932be00ba7ec7ed8c81f1e7971dcfa2b2085 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 19 Sep 2019 22:04:41 +0300
Subject: [PATCH] Cache the items part in List

---
 source/list.cpp | 16 +++++++++-------
 source/list.h   |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/source/list.cpp b/source/list.cpp
index 9be88e5..5d76500 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -44,6 +44,7 @@ void List::init()
 	first = 0;
 	max_scroll = 0;
 	view_size = 5;
+	items_part = 0;
 	ignore_slider_change = false;
 	dragging = false;
 	drag_start_x = 0;
@@ -349,6 +350,11 @@ bool List::navigate(Navigation nav)
 	return true;
 }
 
+void List::on_style_change()
+{
+	items_part = (style ? style->get_part("items") : 0);
+}
+
 void List::move_focus(Navigation nav, bool select)
 {
 	if(nav==NAV_UP)
@@ -386,15 +392,11 @@ void List::item_autosize_changed(Item *item)
 
 unsigned List::last_to_first(unsigned last) const
 {
-	if(!style)
+	if(!items_part)
 		return last;
 
-	unsigned view_h = geom.h;
-	if(const Part *items_part = style->get_part("items"))
-	{
-		const Sides &margin = items_part->get_margin();
-		view_h -= margin.top+margin.bottom;
-	}
+	const Sides &margin = items_part->get_margin();
+	unsigned view_h = geom.h-min(geom.h, margin.top+margin.bottom);
 
 	unsigned items_h = 0;
 	for(unsigned i=last; i<items.size(); --i)
diff --git a/source/list.h b/source/list.h
index 25001d1..43a2457 100644
--- a/source/list.h
+++ b/source/list.h
@@ -145,6 +145,7 @@ private:
 	unsigned first;
 	unsigned max_scroll;
 	unsigned view_size;
+	const Part *items_part;
 	bool ignore_slider_change;
 	bool dragging;
 	int drag_start_x;
@@ -205,6 +206,8 @@ public:
 	virtual void focus_in();
 	virtual bool navigate(Navigation);
 private:
+	virtual void on_style_change();
+
 	void move_focus(Navigation, bool);
 	void set_focus_index(int);
 
-- 
2.43.0