X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/494169d25068e3d3dd2dcc8b37b42d32df6935e7..e1ea45e881637c29c87677ef0cb15fcc600cf502:/lib/gui/elistbox.cpp diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index 873cc937..013a3103 100644 --- a/lib/gui/elistbox.cpp +++ b/lib/gui/elistbox.cpp @@ -1,8 +1,11 @@ #include #include +#include #include -eListbox::eListbox(eWidget *parent): eWidget(parent) +eListbox::eListbox(eWidget *parent) + :eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false) + , m_scrollbar_mode(showNever), m_scrollbar(NULL) { setContent(new eListboxStringContent()); @@ -22,6 +25,27 @@ eListbox::~eListbox() ptr->unbindAction(this, 0); } +void eListbox::setScrollbarMode(int mode) +{ + m_scrollbar_mode = mode; + if ( m_scrollbar ) + { + if ( m_scrollbar_mode == showNever ) + { + delete m_scrollbar; + m_scrollbar=0; + } + } + else + { + 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; @@ -35,6 +59,10 @@ void eListbox::moveSelection(int dir) /* refuse to do anything without a valid list. */ if (!m_content) return; + + /* if our list does not have one entry, don't do anything. */ + if (!m_items_per_page) + return; /* we need the old top/sel to see what we have to redraw */ int oldtop = m_top; @@ -81,7 +109,11 @@ void eListbox::moveSelection(int dir) /* current selection invisible? */ if (m_top + m_items_per_page <= m_content->cursorGet()) { - m_top = m_content->cursorGet() - m_items_per_page + 1; + int rest = m_content->size() % m_items_per_page; + if ( rest ) + m_top = m_content->cursorGet() - rest + 1; + else + m_top = m_content->cursorGet() - m_items_per_page + 1; if (m_top < 0) m_top = 0; } @@ -96,17 +128,18 @@ void eListbox::moveSelection(int dir) /* 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; - } 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; + + updateScrollBar(); if (m_top != oldtop) invalidate(); @@ -123,8 +156,55 @@ void eListbox::moveSelection(int dir) void eListbox::moveSelectionTo(int index) { - printf("Moving to listbox-entry with index %d\n", index); - // TODO: implement it + m_content->cursorHome(); + m_content->cursorMove(index); + moveSelection(justCheck); +} + +void eListbox::updateScrollBar() +{ + if (!m_content || m_scrollbar_mode == showNever ) + return; + 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)); + m_scrollbar->show(); + } + else + { + m_content->setSize(eSize(width, m_itemheight)); + m_scrollbar->hide(); + } + } + 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 ) + ++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) @@ -154,9 +234,16 @@ int eListbox::event(int event, void *data, void *data2) m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled); 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(); - + return 0; } case evtChangedSize: @@ -177,8 +264,11 @@ int eListbox::event(int event, void *data, void *data2) void eListbox::recalcSize() { + m_content_changed=true; + m_prev_scrollbar_page=-1; m_content->setSize(eSize(size().width(), m_itemheight)); m_items_per_page = size().height() / m_itemheight; + moveSelection(justCheck); } void eListbox::setItemHeight(int h) @@ -226,7 +316,7 @@ void eListbox::entryRemoved(int index) m_selected = m_content->cursorGet(); moveSelection(justCheck); - + if ((m_top <= index) && (index < (m_top + m_items_per_page))) { /* todo, calc exact invalidation... */ @@ -243,11 +333,17 @@ void eListbox::entryChanged(int index) } } -void eListbox::entryReset() +void eListbox::entryReset(bool cursorHome) { - if (m_content) - m_content->cursorHome(); - m_top = 0; - m_selected = 0; + m_content_changed=true; + m_prev_scrollbar_page=-1; + if ( cursorHome ) + { + if (m_content) + m_content->cursorHome(); + m_top = 0; + m_selected = 0; + } + moveSelection(justCheck); invalidate(); }