X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4724c0eba2e29f53bd93be10a149e0bb89ae8640..1681d7dadff09e071c4f79954a90969fb7815210:/lib/gui/elistbox.cpp diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index 36310aef..f1efadfd 100644 --- a/lib/gui/elistbox.cpp +++ b/lib/gui/elistbox.cpp @@ -4,22 +4,22 @@ #include eListbox::eListbox(eWidget *parent) - :eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false) - , m_scrollbar(NULL), m_scrollbar_mode(showNever) + :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) { - 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(); @@ -45,10 +48,13 @@ void eListbox::setScrollbarMode(int mode) 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(); } void eListbox::moveSelection(int dir) @@ -56,15 +62,12 @@ 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) { @@ -106,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; } @@ -121,47 +128,54 @@ 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) { - eDebug("%d < %d", m_selected, m_top); m_top -= m_items_per_page; if (m_top < 0) m_top = 0; } - while (m_selected >= m_top + m_items_per_page) - { - eDebug("%d >= %d + %d", 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; - } + + 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 ) { @@ -178,31 +192,29 @@ void eListbox::updateScrollBar() 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); + } } } @@ -264,8 +276,14 @@ 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); } void eListbox::setItemHeight(int h) @@ -313,7 +331,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... */ @@ -330,14 +348,17 @@ void eListbox::entryChanged(int index) } } -void eListbox::entryReset() +void eListbox::entryReset(bool cursorHome) { m_content_changed=true; m_prev_scrollbar_page=-1; - if (m_content) - m_content->cursorHome(); - m_top = 0; - m_selected = 0; + if ( cursorHome ) + { + if (m_content) + m_content->cursorHome(); + m_top = 0; + m_selected = 0; + } moveSelection(justCheck); invalidate(); }