X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8426492f9ab139f78dd307e4df9cd114801b1630..9095daa5b9033537978293224115019c6f68686c:/lib/gui/elistbox.cpp diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index 8da691b4..cfb3d5b4 100644 --- a/lib/gui/elistbox.cpp +++ b/lib/gui/elistbox.cpp @@ -3,23 +3,23 @@ #include #include -eListbox::eListbox(eWidget *parent) - :eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false) - , m_scrollbar_mode(showNever), 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()); +// setContent(new eListboxStringContent()); ePtr ptr; eActionMap::getInstance(ptr); - - m_itemheight = 25; - m_selection_enabled = 1; - ptr->bindAction("ListboxActions", 0, 0, this); } eListbox::~eListbox() { + if (m_scrollbar) + delete m_scrollbar; + ePtr ptr; eActionMap::getInstance(ptr); ptr->unbindAction(this, 0); @@ -28,12 +28,15 @@ eListbox::~eListbox() void eListbox::setScrollbarMode(int mode) { m_scrollbar_mode = mode; - if ( m_scrollbar_mode == showNever && m_scrollbar ) + if (m_scrollbar) { - delete m_scrollbar; - m_scrollbar=0; + if (m_scrollbar_mode == showNever) + { + delete m_scrollbar; + m_scrollbar=0; + } } - else if (!m_scrollbar) + else { m_scrollbar = new eSlider(this); m_scrollbar->hide(); @@ -43,12 +46,51 @@ void eListbox::setScrollbarMode(int mode) } } +void eListbox::setWrapAround(bool state) +{ + m_enabled_wrap_around = state; +} + void eListbox::setContent(iListboxContent *content) { + int oldsel = m_selected; m_content = content; if (content) m_content->setListbox(this); entryReset(); + if (oldsel == m_selected) + /* emit */ selectionChanged(); +} + +bool eListbox::atBegin() +{ + if (m_content && !m_selected) + return true; + return false; +} + +bool eListbox::atEnd() +{ + if (m_content && m_content->size() == m_selected+1) + return true; + return false; +} + +void eListbox::moveToEnd() +{ + /* 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) + 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; + } } void eListbox::moveSelection(int dir) @@ -56,26 +98,35 @@ 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; int oldsel = m_selected; - /* first, move cursor */ switch (dir) { case moveUp: + { m_content->cursorMove(-1); + if (m_enabled_wrap_around && oldsel == m_content->cursorGet()) // must wrap around ? + moveToEnd(); break; + } case moveDown: m_content->cursorMove(1); - /* ok - we could have reached the end. we just go one back then. */ + /* ok - we could have reached the end. So we do wrap around. */ if (!m_content->cursorValid()) - m_content->cursorMove(-1); + { + if (m_enabled_wrap_around) + { + m_top = 0; + m_content->cursorHome(); + } + else + m_content->cursorMove(-1); + } break; case pageUp: if (m_content->cursorGet() >= m_items_per_page) @@ -94,38 +145,59 @@ void eListbox::moveSelection(int dir) 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); - /* current selection invisible? */ - if (m_top + m_items_per_page <= m_content->cursorGet()) - { - 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; - } + moveToEnd(); break; case justCheck: 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. */ /* now, look wether the current selection is out of screen */ m_selected = m_content->cursorGet(); - while (m_selected < m_top) { m_top -= m_items_per_page; @@ -136,72 +208,83 @@ void eListbox::moveSelection(int dir) /* m_top should be always valid here as it's selected */ m_top += m_items_per_page; + if (oldsel != m_selected) + /* emit */ selectionChanged(); + + updateScrollBar(); + if (m_top != oldtop) invalidate(); else if (m_selected != oldsel) { - - /* redraw the old and newly selected */ + /* redraw the old and newly selected */ gRegion inv = eRect(0, m_itemheight * (m_selected-m_top), size().width(), m_itemheight); inv |= eRect(0, m_itemheight * (oldsel-m_top), size().width(), m_itemheight); invalidate(inv); } - - if (m_scrollbar_mode != showNever) - updateScrollBar(); } void eListbox::moveSelectionTo(int index) { - m_content->cursorHome(); - m_content->cursorMove(index); - moveSelection(justCheck); + if (m_content) + { + m_content->cursorHome(); + m_content->cursorMove(index); + moveSelection(justCheck); + } +} + +int eListbox::getCurrentIndex() +{ + if (m_content && m_content->cursorValid()) + return m_content->cursorGet(); + return 0; } void eListbox::updateScrollBar() { + 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)); - if ( !m_scrollbar->isVisible() ) - m_scrollbar->show(); + m_scrollbar->show(); } - else if ( m_scrollbar_mode != showAlways ) + else { - if ( m_scrollbar->isVisible() ) - { - m_content->setSize(eSize(width, m_itemheight)); - m_scrollbar->hide(); // why this hide dont work??? - } + m_content->setSize(eSize(width, m_itemheight)); + m_scrollbar->hide(); } } - int curVisiblePage = m_top / m_items_per_page; - if ( m_scrollbar->isVisible() && - m_prev_scrollbar_page != curVisiblePage) + if (m_items_per_page && entries) { - 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 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); + } } } @@ -227,14 +310,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)); } - 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(); @@ -244,9 +342,11 @@ int eListbox::event(int event, void *data, void *data2) return 0; } + case evtChangedSize: recalcSize(); return eWidget::event(event, data, data2); + case evtAction: if (isVisible()) { @@ -262,8 +362,13 @@ 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; + + if (m_items_per_page < 0) /* TODO: whyever - our size could be invalid, or itemheigh could be wrongly specified. */ + m_items_per_page = 0; + moveSelection(justCheck); } @@ -312,7 +417,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... */ @@ -329,14 +434,29 @@ void eListbox::entryChanged(int index) } } -void eListbox::entryReset() +void eListbox::entryReset(bool selectionHome) { - m_content_changed=true; - m_prev_scrollbar_page=-1; - if (m_content) - m_content->cursorHome(); - m_top = 0; - m_selected = 0; + 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(); }