add possibility to select between different list styles via context menu

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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 7af7dabbf35506c7144edd3424e7d34776a1c49b..c21f363f4b9dd6a13b499e30687adfbeb63c77d9 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -58,6 +58,9 @@ void eListbox::setContent(iListboxContent *content)
        if (content)
                m_content->setListbox(this);
        entryReset();
+                       /* if oldsel != m_selected, selectionChanged was already 
+                          emitted in entryReset. we want it in any case, so otherwise,
+                          emit it now. */
        if (oldsel == m_selected)
                /* emit */ selectionChanged();
 }
@@ -78,6 +81,8 @@ bool eListbox::atEnd()
 
 void eListbox::moveToEnd()
 {
+       if (!m_content)
+               return;
        /* move to last existing one ("end" is already invalid) */
        m_content->cursorEnd(); m_content->cursorMove(-1);
        /* current selection invisible? */
@@ -157,6 +162,41 @@ void eListbox::moveSelection(int dir)
                break;
        }
        
+       if (m_content->cursorValid() && !m_content->currentCursorSelectable())
+       {
+                       /* ok, our cursor position is valid (i.e. in list), but not selectable. */
+                       
+                       /* when moving up, continue until we found a valid position. */
+               if ((dir == moveUp) || (dir == pageDown))
+               {
+                       while (m_content->cursorGet())
+                       {
+                               m_content->cursorMove(-1);
+                               if (m_content->currentCursorSelectable())
+                               {
+                                       break;
+                               }
+                       }
+               } else
+               {
+                               /* else move down */
+                       while (m_content->cursorValid())
+                       {
+                               m_content->cursorMove(+1);
+                               if (m_content->currentCursorSelectable())
+                               {
+                                       break;
+                               }
+                       }
+                       
+                       if (!m_content->cursorValid())
+                               m_content->cursorMove(-1);
+               }
+               
+               if (!m_content->currentCursorSelectable())
+                       m_content->cursorSet(oldsel);
+       }
+       
                /* note that we could be on an invalid cursor position, but we don't
                   care. this only happens on empty lists, and should have almost no
                   side effects. */
@@ -275,14 +315,29 @@ int eListbox::event(int event, void *data, void *data2)
                m_content->cursorSave();
                m_content->cursorMove(m_top - m_selected);
                
+               gRegion entryrect = eRect(0, 0, size().width(), m_itemheight);
+               const gRegion &paint_region = *(gRegion*)data;
+               
                for (int y = 0, i = 0; i <= m_items_per_page; y += m_itemheight, ++i)
                {
-                       m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled);
+                       gRegion entry_clip_rect = paint_region & entryrect;
+
+                       if (!entry_clip_rect.empty())
+                               m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled);
+
+                               /* (we could clip with entry_clip_rect, but 
+                                  this shouldn't change the behaviour of any
+                                  well behaving content, so it would just
+                                  degrade performance without any gain.) */
+
                        m_content->cursorMove(+1);
+                       entryrect.moveBy(ePoint(0, m_itemheight));
                }
 
+               // clear/repaint empty/unused space between scrollbar and listboxentrys
                if (m_scrollbar && m_scrollbar->isVisible())
                {
+                       style->setStyle(painter, eWindowStyle::styleListboxNormal);
                        painter.clip(eRect(m_scrollbar->position() - ePoint(5,0), eSize(5,m_scrollbar->size().height())));
                        painter.clear();
                        painter.clippop();
@@ -292,6 +347,7 @@ int eListbox::event(int event, void *data, void *data2)
 
                return 0;
        }
+
        case evtChangedSize:
                recalcSize();
                return eWidget::event(event, data, data2);
@@ -312,7 +368,8 @@ void eListbox::recalcSize()
 {
        m_content_changed=true;
        m_prev_scrollbar_page=-1;
-       m_content->setSize(eSize(size().width(), m_itemheight));
+       if (m_content)
+               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. */
@@ -340,7 +397,9 @@ void eListbox::setSelectionEnable(int en)
 
 void eListbox::entryAdded(int index)
 {
-               /* manage our local pointers. when the entry was added before the current position, we have to advance. */
+       if (m_content && (m_content->size() % m_items_per_page) == 1)
+               m_content_changed=true;
+       /* 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)
@@ -362,7 +421,10 @@ void eListbox::entryAdded(int index)
 
 void eListbox::entryRemoved(int index)
 {
-       if (index == m_selected)
+       if (m_content && !(m_content->size() % m_items_per_page))
+               m_content_changed=true;
+
+       if (index == m_selected && m_content)
                m_selected = m_content->cursorGet();
 
        moveSelection(justCheck);
@@ -385,7 +447,6 @@ void eListbox::entryChanged(int index)
 
 void eListbox::entryReset(bool selectionHome)
 {
-       eDebug("entry reset");
        m_content_changed = true;
        m_prev_scrollbar_page = -1;