remove unneeded

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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index c4f9ed2c2162277e879250421a9ffe0c4320c897..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(NULL), m_scrollbar_mode(showNever)
+       :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);
@@ -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();
@@ -56,6 +59,10 @@ void eListbox::moveSelection(int dir)
                /* refuse to do anything without a valid list. */
        if (!m_content)
                return;
+       
+               /* if our list does not have one entry, don't do anything. */
+       if (!m_items_per_page)
+               return;
                
                /* we need the old top/sel to see what we have to redraw */
        int oldtop = m_top;
@@ -102,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;
                }
@@ -128,6 +139,8 @@ void eListbox::moveSelection(int dir)
                /* m_top should be always valid here as it's selected */
                m_top += m_items_per_page;
 
+       updateScrollBar();
+
        if (m_top != oldtop)
                invalidate();
        else if (m_selected != oldsel)
@@ -143,13 +156,25 @@ 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()
 {
+       if (!m_content || m_scrollbar_mode == showNever )
+               return;
        int entries = m_content->size();
        if ( m_content_changed )
        {
@@ -166,31 +191,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);
+               }
        }
 }
 
@@ -200,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)
@@ -213,9 +239,6 @@ int eListbox::event(int event, void *data, void *data2)
                
                gPainter &painter = *(gPainter*)data2;
                
-               if (m_scrollbar_mode != showNever)
-                       updateScrollBar();
-               
                m_content->cursorSave();
                m_content->cursorMove(m_top - m_selected);
                
@@ -234,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:
@@ -255,8 +281,17 @@ 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;
+
+       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);
 }
 
 void eListbox::setItemHeight(int h)
@@ -304,7 +339,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... */
@@ -321,13 +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();
 }