better fix

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

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index a3fae34c0687eb773fc5d1fc20626ffeca09f3ee..c4f9ed2c2162277e879250421a9ffe0c4320c897 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -1,14 +1,20 @@
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>

+#include <lib/gui/eslider.h>

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

-eListbox::eListbox(eWidget *parent): eWidget(parent)
+eListbox::eListbox(eWidget *parent)
+       :eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false)
+       , m_scrollbar(NULL), m_scrollbar_mode(showNever)

 {
        setContent(new eListboxStringContent());
 
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
        
 {
        setContent(new eListboxStringContent());
 
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
        

+       m_itemheight = 25;
+       m_selection_enabled = 1;
+       

        ptr->bindAction("ListboxActions", 0, 0, this);
 }
 
        ptr->bindAction("ListboxActions", 0, 0, this);
 }
 


@@ -19,6 +25,24 @@ eListbox::~eListbox()
        ptr->unbindAction(this, 0);
 }
 
        ptr->unbindAction(this, 0);
 }
 

+void eListbox::setScrollbarMode(int mode)
+{
+       m_scrollbar_mode = mode;
+       if ( m_scrollbar_mode == showNever && m_scrollbar )
+       {
+               delete m_scrollbar;
+               m_scrollbar=0;
+       }
+       else if (!m_scrollbar)
+       {
+               m_scrollbar = new eSlider(this);
+               m_scrollbar->hide();
+               m_scrollbar->setBorderWidth(1);
+               m_scrollbar->setOrientation(eSlider::orVertical);
+               m_scrollbar->setRange(0,100);
+       }
+}
+

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


@@ -49,17 +73,39 @@ void eListbox::moveSelection(int dir)
                if (!m_content->cursorValid())
                        m_content->cursorMove(-1);
                break;
                if (!m_content->cursorValid())
                        m_content->cursorMove(-1);
                break;

+       case pageUp:
+               if (m_content->cursorGet() >= m_items_per_page)
+               {
+                       m_content->cursorMove(-m_items_per_page);
+                       m_top -= m_items_per_page;
+                       if (m_top < 0)
+                               m_top = 0;
+               } else
+               {
+                       m_top = 0;
+                       m_content->cursorHome();
+               }
+               break;

        case moveTop:
                m_content->cursorHome();
                m_top = 0; /* align with top, speeds up process */
                break;
        case moveTop:
                m_content->cursorHome();
                m_top = 0; /* align with top, speeds up process */
                break;

+
+       case pageDown:
+               m_content->cursorMove(m_items_per_page);
+               if (m_content->cursorValid())
+                       break;
+                               /* fall through */

        case moveEnd:
                        /* move to last existing one ("end" is already invalid) */
                m_content->cursorEnd(); m_content->cursorMove(-1); 
        case moveEnd:
                        /* move to last existing one ("end" is already invalid) */
                m_content->cursorEnd(); m_content->cursorMove(-1); 

-               
-               m_top = m_content->cursorGet() - m_items_per_page + 1;
-               if (m_top < 0)
-                       m_top = 0;
+                       /* current selection invisible? */
+               if (m_top + m_items_per_page <= m_content->cursorGet())
+               {
+                       m_top = m_content->cursorGet() - m_items_per_page + 1;
+                       if (m_top < 0)
+                               m_top = 0;
+               }

                break;
        case justCheck:
                break;
                break;
        case justCheck:
                break;


@@ -71,17 +117,16 @@ 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)
+
+       while (m_selected < m_top)

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

-       } else if (m_selected >= m_top + m_items_per_page)
-       {
-                       /* m_top should be always valid here as it's selected */
-               m_top += m_items_per_page;

        }
        }

+       while (m_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();


@@ -96,6 +141,59 @@ void eListbox::moveSelection(int dir)
        }
 }
 
        }
 }
 

+void eListbox::moveSelectionTo(int index)
+{
+       m_content->cursorHome();
+       m_content->cursorMove(index);
+       moveSelection(justCheck);
+}
+
+void eListbox::updateScrollBar()
+{
+       int entries = m_content->size();
+       if ( m_content_changed )
+       {
+               int width = size().width();
+               int height = size().height();
+               m_content_changed = false;
+               if ( entries > m_items_per_page || m_scrollbar_mode == showAlways )
+               {
+                       int sbarwidth=width/16;
+                       if ( sbarwidth < 18 )
+                               sbarwidth=18;
+                       if ( sbarwidth > 22 )
+                               sbarwidth=22;
+                       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();
+               }
+               else if ( m_scrollbar_mode != showAlways )
+               {
+                       if ( m_scrollbar->isVisible() )
+                       {
+                               m_content->setSize(eSize(width, m_itemheight));
+                               m_scrollbar->hide(); // why this hide dont work???
+                       }
+               }
+       }
+       int curVisiblePage = m_top / m_items_per_page;
+       if ( m_scrollbar->isVisible() &&
+               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);
+       }
+}
+

 int eListbox::event(int event, void *data, void *data2)
 {
        switch (event)
 int eListbox::event(int event, void *data, void *data2)
 {
        switch (event)


@@ -107,7 +205,6 @@ int eListbox::event(int event, void *data, void *data2)
                if (!m_content)
                        return eWidget::event(event, data, data2);
                assert(m_content);
                if (!m_content)
                        return eWidget::event(event, data, data2);
                assert(m_content);

-               recalcSize(); // move to event

                
                getStyle(style);
                
                
                getStyle(style);
                


@@ -116,22 +213,40 @@ int eListbox::event(int event, void *data, void *data2)
                
                gPainter &painter = *(gPainter*)data2;
                
                
                gPainter &painter = *(gPainter*)data2;
                

+               if (m_scrollbar_mode != showNever)
+                       updateScrollBar();
+               

                m_content->cursorSave();
                m_content->cursorMove(m_top - m_selected);
                
                m_content->cursorSave();
                m_content->cursorMove(m_top - m_selected);
                

-               for (int y = 0, i = 0; i < m_items_per_page; y += m_itemheight, ++i)
+               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->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled);

                        m_content->cursorMove(+1);
                }
                        m_content->cursorMove(+1);
                }

-               
+
+               if ( m_scrollbar && m_scrollbar->isVisible() )
+               {
+                       painter.clip(eRect(m_scrollbar->position() - ePoint(5,0), eSize(5,m_scrollbar->size().height())));
+                       painter.clear();
+                       painter.clippop();
+               }
+

                m_content->cursorRestore();
                m_content->cursorRestore();

-               
+

                return 0;
        }
                return 0;
        }

+       case evtChangedSize:
+               recalcSize();
+               return eWidget::event(event, data, data2);
+               

        case evtAction:
        case evtAction:

-               moveSelection((int)data2);
-               return 1;
+               if (isVisible())
+               {
+                       moveSelection((int)data2);
+                       return 1;
+               }
+               return 0;

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


@@ -139,11 +254,28 @@ int eListbox::event(int event, void *data, void *data2)
 
 void eListbox::recalcSize()
 {
 
 void eListbox::recalcSize()
 {

-       m_itemheight = 20;
+       m_content_changed=true;

        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::setItemHeight(int h)
+{
+       if (h)
+               m_itemheight = h;
+       else
+               m_itemheight = 20;
+       recalcSize();
+}
+
+void eListbox::setSelectionEnable(int en)
+{
+       if (m_selection_enabled == en)
+               return;
+       m_selection_enabled = en;
+       entryChanged(m_selected); /* redraw current entry */
+}
+

 void eListbox::entryAdded(int index)
 {
                /* manage our local pointers. when the entry was added before the current position, we have to advance. */
 void eListbox::entryAdded(int index)
 {
                /* manage our local pointers. when the entry was added before the current position, we have to advance. */


@@ -191,10 +323,11 @@ void eListbox::entryChanged(int index)
 
 void eListbox::entryReset()
 {
 
 void eListbox::entryReset()
 {

+       m_content_changed=true;
+       m_prev_scrollbar_page=-1;

        if (m_content)
                m_content->cursorHome();
        m_top = 0;
        m_selected = 0;
        invalidate();
        if (m_content)
                m_content->cursorHome();
        m_top = 0;
        m_selected = 0;
        invalidate();

-       eDebug("inval!");

 }
 }