- added missing actions (sorry)

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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index e06ab3e6deb129c2ceca06af5bba88459c2c1a7e..a6fe45f1f2612533ed2fb1b296b800ee8976ffbc 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -1,22 +1,38 @@
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>

+#include <lib/actions/action.h>

 
 eListbox::eListbox(eWidget *parent): eWidget(parent)
 {
        setContent(new eListboxStringContent());
 
 eListbox::eListbox(eWidget *parent): eWidget(parent)
 {
        setContent(new eListboxStringContent());

+
+       ePtr<eActionMap> ptr;
+       eActionMap::getInstance(ptr);
+       
+       ptr->bindAction("ListboxActions", 0, 0, this);
+}
+
+eListbox::~eListbox()
+{
+       ePtr<eActionMap> ptr;
+       eActionMap::getInstance(ptr);
+       ptr->unbindAction(this, 0);

 }
 
 void eListbox::setContent(iListboxContent *content)
 {
        m_content = content;
 }
 
 void eListbox::setContent(iListboxContent *content)
 {
        m_content = content;

-       invalidate();
-       m_content->cursorHome();
-       m_top = 0;
-       m_selected = 0;
+       if (content)
+               m_content->setListbox(this);
+       entryReset();

 }
 
 void eListbox::moveSelection(int dir)
 {
 }
 
 void eListbox::moveSelection(int dir)
 {

+               /* refuse to do anything without a valid list. */
+       if (!m_content)
+               return;
+               

                /* we need the old top/sel to see what we have to redraw */
        int oldtop = m_top;
        int oldsel = m_selected;
                /* we need the old top/sel to see what we have to redraw */
        int oldtop = m_top;
        int oldsel = m_selected;


@@ -45,6 +61,8 @@ void eListbox::moveSelection(int dir)
                if (m_top < 0)
                        m_top = 0;
                break;
                if (m_top < 0)
                        m_top = 0;
                break;

+       case justCheck:
+               break;

        }
        
                /* note that we could be on an invalid cursor position, but we don't
        }
        
                /* note that we could be on an invalid cursor position, but we don't


@@ -53,6 +71,7 @@ void eListbox::moveSelection(int dir)
        
                /* now, look wether the current selection is out of screen */
        m_selected = m_content->cursorGet();
        
                /* now, look wether the current selection is out of screen */
        m_selected = m_content->cursorGet();

+       

        if (m_selected < m_top)
        {
                m_top -= m_items_per_page;
        if (m_selected < m_top)
        {
                m_top -= m_items_per_page;


@@ -63,11 +82,12 @@ void eListbox::moveSelection(int dir)
                        /* m_top should be always valid here as it's selected */
                m_top += m_items_per_page;
        }
                        /* m_top should be always valid here as it's selected */
                m_top += m_items_per_page;
        }

-       
+

        if (m_top != oldtop)
                invalidate();
        if (m_top != oldtop)
                invalidate();

-       else
+       else if (m_selected != oldsel)

        {
        {

+               

                        /* 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);
                        /* 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);


@@ -84,6 +104,8 @@ int eListbox::event(int event, void *data, void *data2)
        {
                ePtr<eWindowStyle> style;
                
        {
                ePtr<eWindowStyle> style;
                

+               if (!m_content)
+                       return eWidget::event(event, data, data2);

                assert(m_content);
                recalcSize(); // move to event
                
                assert(m_content);
                recalcSize(); // move to event
                


@@ -107,6 +129,9 @@ int eListbox::event(int event, void *data, void *data2)
                
                return 0;
        }
                
                return 0;
        }

+       case evtAction:
+               moveSelection((int)data2);
+               return 1;

        default:
                return eWidget::event(event, data, data2);
        }
        default:
                return eWidget::event(event, data, data2);
        }


@@ -118,3 +143,57 @@ void eListbox::recalcSize()
        m_content->setSize(eSize(size().width(), m_itemheight));
        m_items_per_page = size().height() / m_itemheight;
 }
        m_content->setSize(eSize(size().width(), m_itemheight));
        m_items_per_page = size().height() / m_itemheight;
 }

+
+void eListbox::entryAdded(int index)
+{
+               /* manage our local pointers. when the entry was added before the current position, we have to advance. */
+               
+               /* we need to check <= - when the new entry has the (old) index of the cursor, the cursor was just moved down. */
+       if (index <= m_selected)
+               ++m_selected;
+       if (index <= m_top)
+               ++m_top;
+               
+               /* we have to check wether our current cursor is gone out of the screen. */
+               /* moveSelection will check for this case */
+       moveSelection(justCheck);
+       
+               /* now, check if the new index is visible. */
+       if ((m_top <= index) && (index < (m_top + m_items_per_page)))
+       {
+                       /* todo, calc exact invalidation... */
+               invalidate();
+       }
+}
+
+void eListbox::entryRemoved(int index)
+{
+       if (index == m_selected)
+               m_selected = m_content->cursorGet();
+
+       moveSelection(justCheck);
+       
+       if ((m_top <= index) && (index < (m_top + m_items_per_page)))
+       {
+                       /* todo, calc exact invalidation... */
+               invalidate();
+       }
+}
+
+void eListbox::entryChanged(int index)
+{
+       if ((m_top <= index) && (index < (m_top + m_items_per_page)))
+       {
+               gRegion inv = eRect(0, m_itemheight * (index-m_top), size().width(), m_itemheight);
+               invalidate(inv);
+       }
+}
+
+void eListbox::entryReset()
+{
+       if (m_content)
+               m_content->cursorHome();
+       m_top = 0;
+       m_selected = 0;
+       invalidate();
+}