X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8d1f62f6525ccfdbcb83c64f701dbbc325c37dbd..ea9231ad7229f47ebf117a3b4894a9e4e7a3c40a:/lib/gui/elistbox.cpp diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index 747733d3..73fbff3b 100644 --- a/lib/gui/elistbox.cpp +++ b/lib/gui/elistbox.cpp @@ -8,6 +8,7 @@ eListbox::eListbox(eWidget *parent) : 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) { + memset(&m_style, 0, sizeof(m_style)); // setContent(new eListboxStringContent()); ePtr ptr; @@ -58,6 +59,9 @@ void eListbox::setContent(iListboxContent *content) if (content) m_content->setListbox(this); entryReset(); + /* if oldsel != m_selected, selectionChanged was already + emitted in entryReset. we want it in any case, so otherwise, + emit it now. */ if (oldsel == m_selected) /* emit */ selectionChanged(); } @@ -78,6 +82,8 @@ bool eListbox::atEnd() 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? */ @@ -159,49 +165,37 @@ void eListbox::moveSelection(int dir) if (m_content->cursorValid() && !m_content->currentCursorSelectable()) { - eDebug("position not selectable"); /* 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)) { - eDebug("moving up"); while (m_content->cursorGet()) { - eDebug("tick"); m_content->cursorMove(-1); if (m_content->currentCursorSelectable()) { - eDebug("now ok"); break; } } } else { - eDebug("moving down"); + /* else move down */ while (m_content->cursorValid()) { - eDebug("TICK"); m_content->cursorMove(+1); if (m_content->currentCursorSelectable()) { - eDebug("NOW ok"); break; } } if (!m_content->cursorValid()) - { - eDebug("not valid (i.e.: end)"); m_content->cursorMove(-1); - } } if (!m_content->currentCursorSelectable()) - { - eDebug("can't move!"); m_content->cursorSet(oldsel); - } } /* note that we could be on an invalid cursor position, but we don't @@ -232,7 +226,6 @@ void eListbox::moveSelection(int dir) /* 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); } } @@ -300,6 +293,11 @@ void eListbox::updateScrollBar() } } +int eListbox::getEntryTop() +{ + return (m_selected - m_top) * m_itemheight; +} + int eListbox::event(int event, void *data, void *data2) { switch (event) @@ -322,14 +320,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)); } + // 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(); @@ -339,6 +352,7 @@ int eListbox::event(int event, void *data, void *data2) return 0; } + case evtChangedSize: recalcSize(); return eWidget::event(event, data, data2); @@ -359,7 +373,8 @@ void eListbox::recalcSize() { 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. */ @@ -387,7 +402,9 @@ void eListbox::setSelectionEnable(int en) void eListbox::entryAdded(int index) { - /* manage our local pointers. when the entry was added before the current position, we have to advance. */ + if (m_content && (m_content->size() % m_items_per_page) == 1) + m_content_changed=true; + /* manage our local pointers. when the entry was added before the current position, we have to advance. */ /* we need to check <= - when the new entry has the (old) index of the cursor, the cursor was just moved down. */ if (index <= m_selected) @@ -409,10 +426,16 @@ void eListbox::entryAdded(int index) void eListbox::entryRemoved(int index) { - if (index == m_selected) + if (m_content && !(m_content->size() % m_items_per_page)) + m_content_changed=true; + + if (index == m_selected && m_content) m_selected = m_content->cursorGet(); - moveSelection(justCheck); + if (m_content && m_content->cursorGet() >= m_content->size()) + moveSelection(moveUp); + else + moveSelection(justCheck); if ((m_top <= index) && (index < (m_top + m_items_per_page))) { @@ -456,3 +479,52 @@ void eListbox::entryReset(bool selectionHome) moveSelection(justCheck); invalidate(); } + +void eListbox::setBackgroundColor(gRGB &col) +{ + m_style.m_background_color = col; + m_style.m_background_color_set = 1; +} + +void eListbox::setBackgroundColorSelected(gRGB &col) +{ + m_style.m_background_color_selected = col; + m_style.m_background_color_selected_set = 1; +} + +void eListbox::setForegroundColor(gRGB &col) +{ + m_style.m_foreground_color = col; + m_style.m_foreground_color_set = 1; +} + +void eListbox::setForegroundColorSelected(gRGB &col) +{ + m_style.m_foreground_color_selected = col; + m_style.m_foreground_color_selected_set = 1; +} + +void eListbox::setBackgroundPicture(ePtr &pm) +{ + m_style.m_background = pm; +} + +void eListbox::setSelectionPicture(ePtr &pm) +{ + m_style.m_selection = pm; +} + +void eListbox::invalidate(const gRegion ®ion) +{ + gRegion tmp(region); + if (m_content) + m_content->updateClip(tmp); + eWidget::invalidate(tmp); +} + +struct eListboxStyle *eListbox::getLocalStyle(void) +{ + /* transparency is set directly in the widget */ + m_style.m_transparent_background = isTransparent(); + return &m_style; +}