X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4724c0eba2e29f53bd93be10a149e0bb89ae8640..ce507f3fbf0e8491aaea32e1322996f23ab316f2:/lib/gui/elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 36310aef..9b876c8c 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -5,7 +5,7 @@
 
 eListbox::eListbox(eWidget *parent)
 	:eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false)
-	, m_scrollbar(NULL), m_scrollbar_mode(showNever)
+	, m_scrollbar_mode(showNever), m_scrollbar(NULL)
 {
 	setContent(new eListboxStringContent());
 
@@ -28,12 +28,15 @@ eListbox::~eListbox()
 void eListbox::setScrollbarMode(int mode)
 {
 	m_scrollbar_mode = mode;
-	if ( m_scrollbar_mode == showNever && m_scrollbar )
+	if ( m_scrollbar )
 	{
-		delete m_scrollbar;
-		m_scrollbar=0;
+		if ( m_scrollbar_mode == showNever )
+		{
+			delete m_scrollbar;
+			m_scrollbar=0;
+		}
 	}
-	else if (!m_scrollbar)
+	else
 	{
 		m_scrollbar = new eSlider(this);
 		m_scrollbar->hide();
@@ -106,7 +109,11 @@ void eListbox::moveSelection(int dir)
 			/* current selection invisible? */
 		if (m_top + m_items_per_page <= m_content->cursorGet())
 		{
-			m_top = m_content->cursorGet() - m_items_per_page + 1;
+			int rest = m_content->size() % m_items_per_page;
+			if ( rest )
+				m_top = m_content->cursorGet() - rest + 1;
+			else
+				m_top = m_content->cursorGet() - m_items_per_page + 1;
 			if (m_top < 0)
 				m_top = 0;
 		}
@@ -124,18 +131,15 @@ void eListbox::moveSelection(int dir)
 
 	while (m_selected < m_top)
 	{
-		eDebug("%d < %d", m_selected, m_top);
 		m_top -= m_items_per_page;
 		if (m_top < 0)
 			m_top = 0;
 	}
-	
 	while (m_selected >= m_top + m_items_per_page)
-	{
-		eDebug("%d >= %d + %d", m_selected, m_top, m_items_per_page);
 		/* m_top should be always valid here as it's selected */
 		m_top += m_items_per_page;
-	}
+
+	updateScrollBar();
 
 	if (m_top != oldtop)
 		invalidate();
@@ -148,9 +152,6 @@ void eListbox::moveSelection(int dir)
 		
 		invalidate(inv);
 	}
-
-	if (m_scrollbar_mode != showNever)
-		updateScrollBar();
 }
 
 void eListbox::moveSelectionTo(int index)
@@ -162,6 +163,8 @@ void eListbox::moveSelectionTo(int index)
 
 void eListbox::updateScrollBar()
 {
+	if (!m_content || m_scrollbar_mode == showNever )
+		return;
 	int entries = m_content->size();
 	if ( m_content_changed )
 	{
@@ -178,31 +181,29 @@ void eListbox::updateScrollBar()
 			m_scrollbar->move(ePoint(width-sbarwidth, 0));
 			m_scrollbar->resize(eSize(sbarwidth, height));
 			m_content->setSize(eSize(width-sbarwidth-5, m_itemheight));
-			if ( !m_scrollbar->isVisible() )
-				m_scrollbar->show();
+			m_scrollbar->show();
 		}
-		else if ( m_scrollbar_mode != showAlways )
+		else
 		{
-			if ( m_scrollbar->isVisible() )
-			{
-				m_content->setSize(eSize(width, m_itemheight));
-				m_scrollbar->hide(); // why this hide dont work???
-			}
+			m_content->setSize(eSize(width, m_itemheight));
+			m_scrollbar->hide();
 		}
 	}
-	int curVisiblePage = m_top / m_items_per_page;
-	if ( m_scrollbar->isVisible() &&
-		m_prev_scrollbar_page != curVisiblePage)
+	if ( m_items_per_page && entries )
 	{
-		m_prev_scrollbar_page = curVisiblePage;
-		int pages = entries / m_items_per_page;
-		if ( (pages*m_items_per_page) < entries )
-			++pages;
-		int start=(m_top*100)/(pages*m_items_per_page);
-		int vis=(m_items_per_page*100)/(pages*m_items_per_page);
-		if (vis < 3)
-			vis=3;
-		m_scrollbar->setStartEnd(start,start+vis);
+		int curVisiblePage = m_top / m_items_per_page;
+		if (m_prev_scrollbar_page != curVisiblePage)
+		{
+			m_prev_scrollbar_page = curVisiblePage;
+			int pages = entries / m_items_per_page;
+			if ( (pages*m_items_per_page) < entries )
+				++pages;
+			int start=(m_top*100)/(pages*m_items_per_page);
+			int vis=(m_items_per_page*100)/(pages*m_items_per_page);
+			if (vis < 3)
+				vis=3;
+			m_scrollbar->setStartEnd(start,start+vis);
+		}
 	}
 }
 
@@ -264,8 +265,10 @@ int eListbox::event(int event, void *data, void *data2)
 void eListbox::recalcSize()
 {
 	m_content_changed=true;
+	m_prev_scrollbar_page=-1;
 	m_content->setSize(eSize(size().width(), m_itemheight));
 	m_items_per_page = size().height() / m_itemheight;
+	updateScrollBar();
 }
 
 void eListbox::setItemHeight(int h)
@@ -313,7 +316,7 @@ void eListbox::entryRemoved(int index)
 		m_selected = m_content->cursorGet();
 
 	moveSelection(justCheck);
-	
+
 	if ((m_top <= index) && (index < (m_top + m_items_per_page)))
 	{
 			/* todo, calc exact invalidation... */
@@ -339,5 +342,6 @@ void eListbox::entryReset()
 	m_top = 0;
 	m_selected = 0;
 	moveSelection(justCheck);
+	updateScrollBar();
 	invalidate();
 }