X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f58e4c7b0aa0b7246b56e1956e23cf5b41dd6f9c..99f2eac17b09061f69ac92bc4d06b2f3e5576e5a:/lib/gui/elistbox.cpp diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index f3028ae3..c13114e8 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; @@ -53,13 +54,10 @@ void eListbox::setWrapAround(bool 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() @@ -78,6 +76,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? */ @@ -93,7 +93,7 @@ void eListbox::moveToEnd() } } -void eListbox::moveSelection(int dir) +void eListbox::moveSelection(long dir) { /* refuse to do anything without a valid list. */ if (!m_content) @@ -220,7 +220,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); } } @@ -280,7 +279,7 @@ void eListbox::updateScrollBar() 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); + int vis=(m_items_per_page*100+pages*m_items_per_page-1)/(pages*m_items_per_page); if (vis < 3) vis=3; m_scrollbar->setStartEnd(start,start+vis); @@ -288,6 +287,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) @@ -298,7 +302,7 @@ int eListbox::event(int event, void *data, void *data2) if (!m_content) return eWidget::event(event, data, data2); - assert(m_content); + ASSERT(m_content); getStyle(style); @@ -312,7 +316,7 @@ int eListbox::event(int event, void *data, void *data2) 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) { gRegion entry_clip_rect = paint_region & entryrect; @@ -321,7 +325,7 @@ 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); /* (we could clip with entry_clip_rect, but - this shouldn't change the behaviour of any + this shouldn't change the behavior of any well behaving content, so it would just degrade performance without any gain.) */ @@ -329,8 +333,10 @@ int eListbox::event(int event, void *data, void *data2) 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(); @@ -340,6 +346,7 @@ int eListbox::event(int event, void *data, void *data2) return 0; } + case evtChangedSize: recalcSize(); return eWidget::event(event, data, data2); @@ -347,7 +354,7 @@ int eListbox::event(int event, void *data, void *data2) case evtAction: if (isVisible()) { - moveSelection((int)data2); + moveSelection((long)data2); return 1; } return 0; @@ -360,7 +367,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. */ @@ -388,7 +396,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) @@ -410,10 +420,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))) { @@ -435,6 +451,7 @@ void eListbox::entryReset(bool selectionHome) { m_content_changed = true; m_prev_scrollbar_page = -1; + int oldsel; if (selectionHome) { @@ -451,9 +468,63 @@ void eListbox::entryReset(bool selectionHome) else m_selected = 0; m_content->cursorSet(m_selected); - selectionChanged(); } + oldsel = m_selected; moveSelection(justCheck); + /* if oldsel != m_selected, selectionChanged was already + emitted in moveSelection. we want it in any case, so otherwise, + emit it now. */ + if (oldsel == m_selected) + /* emit */ selectionChanged(); 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; +}