Support focus animation for listbox

[vuplus_dvbapp] / lib / gui / elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index d4c653f..f241e6f 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -2,6 +2,9 @@
 #include <lib/gui/elistboxcontent.h>
 #include <lib/gui/eslider.h>
 #include <lib/actions/action.h>
+#ifdef USE_LIBVUGLES2
+#include "vuplus_gles.h"
+#endif
 
 eListbox::eListbox(eWidget *parent) :
        eWidget(parent), m_scrollbar_mode(showNever), m_prev_scrollbar_page(-1),
@@ -54,16 +57,10 @@ void eListbox::setWrapAround(bool state)
 
 void eListbox::setContent(iListboxContent *content)
 {
-       int oldsel = m_selected;
        m_content = 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();
 }
 
 bool eListbox::atBegin()
@@ -111,6 +108,9 @@ void eListbox::moveSelection(long dir)
        int oldtop = m_top;
        int oldsel = m_selected;
                /* first, move cursor */
+#ifdef USE_LIBVUGLES2
+       m_dir = dir;
+#endif
        switch (dir)
        {
        case moveUp:
@@ -285,7 +285,7 @@ void eListbox::updateScrollBar()
                        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);
+                       int vis=(m_items_per_page*100+pages*m_items_per_page-1)/(pages*m_items_per_page);
                        if (vis < 3)
                                vis=3;
                        m_scrollbar->setStartEnd(start,start+vis);
@@ -308,7 +308,7 @@ int eListbox::event(int event, void *data, void *data2)
                
                if (!m_content)
                        return eWidget::event(event, data, data2);
-               assert(m_content);
+               ASSERT(m_content);
                
                getStyle(style);
                
@@ -329,9 +329,17 @@ int eListbox::event(int event, void *data, void *data2)
 
                        if (!entry_clip_rect.empty())
                                m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled);
+#ifdef USE_LIBVUGLES2
+                       if (m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled) {
+                               ePoint pos = getAbsolutePosition();
+                               painter.sendShowItem(m_dir, ePoint(pos.x(), pos.y() + y), eSize(m_scrollbar && m_scrollbar->isVisible() ? size().width() - m_scrollbar->size().width() : size().width(), m_itemheight));
+                               gles_set_animation_listbox_current(pos.x(), pos.y() + y, m_scrollbar && m_scrollbar->isVisible() ? size().width() - m_scrollbar->size().width() : size().width(), m_itemheight);
+                               m_dir = justCheck;
+                       }
+#endif
 
                                /* (we could clip with entry_clip_rect, but 
-                                  this shouldn't change the behaviour of any
+                                  this shouldn't change the behavior of any
                                   well behaving content, so it would just
                                   degrade performance without any gain.) */
 
@@ -457,6 +465,7 @@ void eListbox::entryReset(bool selectionHome)
 {
        m_content_changed = true;
        m_prev_scrollbar_page = -1;
+       int oldsel;
 
        if (selectionHome)
        {
@@ -473,13 +482,23 @@ void eListbox::entryReset(bool selectionHome)
                else
                        m_selected = 0;
                m_content->cursorSet(m_selected);
-               selectionChanged();
        }
        
+       oldsel = m_selected;
        moveSelection(justCheck);
+               /* if oldsel != m_selected, selectionChanged was already 
+                  emitted in moveSelection. we want it in any case, so otherwise,
+                  emit it now. */
+       if (oldsel == m_selected)
+               /* emit */ selectionChanged();
        invalidate();
 }
 
+void eListbox::setFont(gFont *font)
+{
+       m_style.m_font = font;
+}
+
 void eListbox::setBackgroundColor(gRGB &col)
 {
        m_style.m_background_color = col;