fix z ordering of screens

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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 9b876c8c6c58bfbfc3a2759122baa72c8695e7b9..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,7 +283,11 @@ void eListbox::recalcSize()
        m_prev_scrollbar_page=-1;
        m_content->setSize(eSize(size().width(), m_itemheight));
        m_items_per_page = size().height() / m_itemheight;
-       updateScrollBar();
+
+       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);
 }
 
 void eListbox::setItemHeight(int h)
@@ -333,15 +352,17 @@ void eListbox::entryChanged(int index)
        }
 }
 
-void eListbox::entryReset()
+void eListbox::entryReset(bool cursorHome)
 {
        m_content_changed=true;
        m_prev_scrollbar_page=-1;
-       if (m_content)
-               m_content->cursorHome();
-       m_top = 0;
-       m_selected = 0;
+       if ( cursorHome )
+       {
+               if (m_content)
+                       m_content->cursorHome();
+               m_top = 0;
+               m_selected = 0;
+       }
        moveSelection(justCheck);
-       updateScrollBar();
        invalidate();
 }