add selchanged signal to listbox

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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 21394de5ac4f827d26efe9ffa6f069aad9630cc0..f1efadfd8a7a94baae9a472cf10399a361763c58 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -4,17 +4,14 @@
 #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());
+//     setContent(new eListboxStringContent());
 
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
-       
-       m_itemheight = 25;
-       m_selection_enabled = 1;
-       
        ptr->bindAction("ListboxActions", 0, 0, this);
 }
 
@@ -51,10 +48,13 @@ void eListbox::setScrollbarMode(int mode)
 
 void eListbox::setContent(iListboxContent *content)
 {
+       int oldsel = m_selected;
        m_content = content;
        if (content)
                m_content->setListbox(this);
        entryReset();
+       if (oldsel == m_selected)
+               /* emit */ selectionChanged();
 }
 
 void eListbox::moveSelection(int dir)
@@ -62,15 +62,12 @@ 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;
        int oldsel = m_selected;
-       
                /* first, move cursor */
        switch (dir)
        {
@@ -131,7 +128,6 @@ void eListbox::moveSelection(int dir)
        
                /* now, look wether the current selection is out of screen */
        m_selected = m_content->cursorGet();
-
        while (m_selected < m_top)
        {
                m_top -= m_items_per_page;
@@ -142,14 +138,16 @@ void eListbox::moveSelection(int dir)
                /* m_top should be always valid here as it's selected */
                m_top += m_items_per_page;
 
+       if (oldsel != m_selected)
+               /* emit */ selectionChanged();
+
        updateScrollBar();
 
        if (m_top != oldtop)
                invalidate();
        else if (m_selected != oldsel)
        {
-               
-                       /* redraw the old and newly selected */
+   /* redraw the old and newly selected */
                gRegion inv = eRect(0, m_itemheight * (m_selected-m_top), size().width(), m_itemheight);
                inv |= eRect(0, m_itemheight * (oldsel-m_top), size().width(), m_itemheight);
                
@@ -159,9 +157,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()
@@ -271,6 +279,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);
 }