X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/91d875c1fe21ae2333475c74d46215b2ad3063cd..5c644fbbceaa79a49501975de16b090771edee29:/lib/gui/elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 362a3f84..6e49dcb5 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -110,7 +110,7 @@ void eListboxTestContent::setSize(const eSize &size)
 
 void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
 	painter.clip(eRect(offset, m_size));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -219,7 +219,7 @@ void eListboxStringContent::setSize(const eSize &size)
 
 void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -246,6 +246,7 @@ void eListboxStringContent::setList(std::list<std::string> &list)
 	m_list = list;
 	m_size = list.size();
 	cursorHome();
+	m_listbox->entryReset(false);
 }
 
 //////////////////////////////////////
@@ -327,7 +328,7 @@ void eListboxPythonStringContent::setSize(const eSize &size)
 
 void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -366,9 +367,8 @@ void eListboxPythonStringContent::setList(PyObject *list)
 		Py_INCREF(m_list);
 	}
 
-	//always invalidate when we get a new list
 	if (m_listbox)
-		m_listbox->invalidate();
+		m_listbox->entryReset(false);
 }
 
 PyObject *eListboxPythonStringContent::getCurrentSelection()
@@ -398,8 +398,8 @@ void eListboxPythonStringContent::invalidate()
 
 void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
-	ePtr<gFont> fnt2 = new gFont("Arial", 16);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
+	ePtr<gFont> fnt2 = new gFont("Regular", 16);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();