#include <lib/gui/eslider.h>
#include <lib/actions/action.h>
-eListbox::eListbox(eWidget *parent)
- :eWidget(parent), m_scrollbar_mode(showNever), m_prev_scrollbar_page(-1)
- ,m_content_changed(false), m_enabled_wrap_around(false), m_top(0), m_selected(0), m_itemheight(25)
- ,m_items_per_page(0), m_selection_enabled(1), m_scrollbar(NULL)
+eListbox::eListbox(eWidget *parent) :
+ eWidget(parent), m_scrollbar_mode(showNever), m_prev_scrollbar_page(-1),
+ m_content_changed(false), m_enabled_wrap_around(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());
void eListbox::setScrollbarMode(int mode)
{
m_scrollbar_mode = mode;
- if ( m_scrollbar )
+ if (m_scrollbar)
{
- if ( m_scrollbar_mode == showNever )
+ if (m_scrollbar_mode == showNever)
{
delete m_scrollbar;
m_scrollbar=0;
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? */
if (m_top + m_items_per_page <= m_content->cursorGet())
{
int rest = m_content->size() % m_items_per_page;
- if ( rest )
+ if (rest)
m_top = m_content->cursorGet() - rest + 1;
else
m_top = m_content->cursorGet() - m_items_per_page + 1;
case moveUp:
{
m_content->cursorMove(-1);
- if ( m_enabled_wrap_around && oldsel == m_content->cursorGet() ) // must wrap around ?
+ if (m_enabled_wrap_around && oldsel == m_content->cursorGet()) // must wrap around ?
moveToEnd();
break;
}
/* ok - we could have reached the end. So we do wrap around. */
if (!m_content->cursorValid())
{
- if ( m_enabled_wrap_around )
+ if (m_enabled_wrap_around)
{
m_top = 0;
m_content->cursorHome();
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. */
void eListbox::moveSelectionTo(int index)
{
- if ( m_content )
+ if (m_content)
{
m_content->cursorHome();
m_content->cursorMove(index);
int eListbox::getCurrentIndex()
{
- if ( m_content && m_content->cursorValid() )
+ if (m_content && m_content->cursorValid())
return m_content->cursorGet();
return 0;
}
if (!m_content || m_scrollbar_mode == showNever )
return;
int entries = m_content->size();
- if ( m_content_changed )
+ 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 )
+ if (entries > m_items_per_page || m_scrollbar_mode == showAlways)
{
int sbarwidth=width/16;
- if ( sbarwidth < 18 )
- sbarwidth=18;
- if ( sbarwidth > 22 )
- sbarwidth=22;
+ 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));
m_scrollbar->hide();
}
}
- if ( m_items_per_page && entries )
+ if (m_items_per_page && entries)
{
int curVisiblePage = m_top / m_items_per_page;
if (m_prev_scrollbar_page != curVisiblePage)
{
m_prev_scrollbar_page = curVisiblePage;
int pages = entries / m_items_per_page;
- if ( (pages*m_items_per_page) < entries )
+ 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);
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));
}
- if ( m_scrollbar && m_scrollbar->isVisible() )
+ // 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();
return 0;
}
+
case evtChangedSize:
recalcSize();
return eWidget::event(event, data, data2);
{
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. */
void eListbox::entryRemoved(int index)
{
- if (index == m_selected)
+ if (index == m_selected && m_content)
m_selected = m_content->cursorGet();
moveSelection(justCheck);
}
}
-void eListbox::entryReset(bool cursorHome)
+void eListbox::entryReset(bool selectionHome)
{
- m_content_changed=true;
- m_prev_scrollbar_page=-1;
- if ( cursorHome )
+ m_content_changed = true;
+ m_prev_scrollbar_page = -1;
+
+ if (selectionHome)
{
if (m_content)
m_content->cursorHome();
m_top = 0;
m_selected = 0;
}
+
+ if (m_content && (m_selected >= m_content->size()))
+ {
+ if (m_content->size())
+ m_selected = m_content->size() - 1;
+ else
+ m_selected = 0;
+ m_content->cursorSet(m_selected);
+ selectionChanged();
+ }
+
moveSelection(justCheck);
invalidate();
}