X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/82437c6e4fa79ffde6e2dcdfef1b88a1c9811430..5a6917c166569dee402a82e384ec85d7adf61fa7:/lib/gui/elistbox.cpp diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index 701110bd..d9f95c4b 100644 --- a/lib/gui/elistbox.cpp +++ b/lib/gui/elistbox.cpp @@ -3,12 +3,12 @@ #include #include -eListbox::eListbox(eWidget *parent) - :eWidget(parent), m_scrollbar_mode(showNever), m_prev_scrollbar_page(-1) - ,m_content_changed(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()); +// setContent(new eListboxStringContent()); ePtr ptr; eActionMap::getInstance(ptr); @@ -28,9 +28,9 @@ eListbox::~eListbox() 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; @@ -46,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) @@ -59,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) @@ -97,26 +145,13 @@ 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; @@ -128,7 +163,6 @@ void eListbox::moveSelection(int dir) /* 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; @@ -139,14 +173,16 @@ 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); @@ -156,7 +192,7 @@ void eListbox::moveSelection(int dir) void eListbox::moveSelectionTo(int index) { - if ( m_content ) + if (m_content) { m_content->cursorHome(); m_content->cursorMove(index); @@ -166,7 +202,7 @@ void eListbox::moveSelectionTo(int index) int eListbox::getCurrentIndex() { - if ( m_content && m_content->cursorValid() ) + if (m_content && m_content->cursorValid()) return m_content->cursorGet(); return 0; } @@ -176,18 +212,18 @@ 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)); @@ -199,14 +235,14 @@ void eListbox::updateScrollBar() 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); @@ -223,9 +259,6 @@ int eListbox::event(int event, void *data, void *data2) { case evtPaint: { - timeval t, t2; - gettimeofday(&t, 0); - ePtr style; if (!m_content) @@ -248,7 +281,7 @@ int eListbox::event(int event, void *data, void *data2) m_content->cursorMove(+1); } - if ( m_scrollbar && m_scrollbar->isVisible() ) + if (m_scrollbar && m_scrollbar->isVisible()) { painter.clip(eRect(m_scrollbar->position() - ePoint(5,0), eSize(5,m_scrollbar->size().height()))); painter.clear(); @@ -257,9 +290,6 @@ int eListbox::event(int event, void *data, void *data2) m_content->cursorRestore(); - gettimeofday(&t2, 0); - t2 -= t; - eDebug("draw %d:%d", t2.tv_sec, t2.tv_usec); return 0; } case evtChangedSize: @@ -285,9 +315,6 @@ void eListbox::recalcSize() m_content->setSize(eSize(size().width(), m_itemheight)); m_items_per_page = size().height() / m_itemheight; - if (m_items_per_page > 20) - eDebug("eListbox::recalcSize() m_items_per_page %d", m_items_per_page); - if (m_items_per_page < 0) /* TODO: whyever - our size could be invalid, or itemheigh could be wrongly specified. */ m_items_per_page = 0; @@ -356,17 +383,29 @@ void eListbox::entryChanged(int index) } } -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(); }