remove unneeded

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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index ccd13ff4f51ad628b69b136971159632be2b8059..701110bdea071fe01aa2fa94d7e9b4228e901b34 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -4,22 +4,22 @@
 #include <lib/actions/action.h>
 
 eListbox::eListbox(eWidget *parent)
-       :eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false)
-       , m_scrollbar_mode(showNever), m_scrollbar(NULL)
+       :eWidget(parent), m_scrollbar_mode(showNever), m_prev_scrollbar_page(-1)
+       ,m_content_changed(false), m_top(0), m_selected(0), m_itemheight(25)
+       ,m_items_per_page(0), m_selection_enabled(1), m_scrollbar(NULL)
 {
        setContent(new eListboxStringContent());
 
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
-       
-       m_itemheight = 25;
-       m_selection_enabled = 1;
-       
        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 +156,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()
@@ -213,6 +223,9 @@ int eListbox::event(int event, void *data, void *data2)
        {
        case evtPaint:
        {
+               timeval t, t2;
+               gettimeofday(&t, 0);
+
                ePtr<eWindowStyle> style;
                
                if (!m_content)
@@ -244,6 +257,9 @@ int eListbox::event(int event, void *data, void *data2)
 
                m_content->cursorRestore();
 
+               gettimeofday(&t2, 0);
+               t2 -= t;
+               eDebug("draw %d:%d", t2.tv_sec, t2.tv_usec);
                return 0;
        }
        case evtChangedSize:
@@ -268,6 +284,13 @@ 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 > 20)
+               eDebug("eListbox::recalcSize() m_items_per_page %d", m_items_per_page);
+
+       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);
 }
 
@@ -333,14 +356,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);
        invalidate();
 }