fix z ordering of screens

[enigma2.git] / lib / gui / elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 013a31036eb618d5835187368666094415be4c1c..aba7443227d23a83598643ac21cc445f7fbe941c 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -15,11 +15,16 @@ eListbox::eListbox(eWidget *parent)
        m_itemheight = 25;
        m_selection_enabled = 1;
        
+       m_items_per_page = 0;
+       
        ptr->bindAction("ListboxActions", 0, 0, this);
 }
 
 eListbox::~eListbox()
 {
+       if (m_scrollbar)
+               delete m_scrollbar;
+       
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
        ptr->unbindAction(this, 0);
@@ -156,9 +161,19 @@ void eListbox::moveSelection(int dir)
 
 void eListbox::moveSelectionTo(int index)
 {
-       m_content->cursorHome();
-       m_content->cursorMove(index);
-       moveSelection(justCheck);
+       if ( m_content )
+       {
+               m_content->cursorHome();
+               m_content->cursorMove(index);
+               moveSelection(justCheck);
+       }
+}
+
+int eListbox::getCurrentIndex()
+{
+       if ( m_content && m_content->cursorValid() )
+               return m_content->cursorGet();
+       return 0;
 }
 
 void eListbox::updateScrollBar()
@@ -268,6 +283,10 @@ void eListbox::recalcSize()
        m_prev_scrollbar_page=-1;
        m_content->setSize(eSize(size().width(), m_itemheight));
        m_items_per_page = size().height() / m_itemheight;
+
+       if (m_items_per_page < 0) /* TODO: whyever - our size could be invalid, or itemheigh could be wrongly specified. */
+               m_items_per_page = 0;
+
        moveSelection(justCheck);
 }