git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
[enigma2.git]
/
lib
/
gui
/
elistbox.cpp
diff --git
a/lib/gui/elistbox.cpp
b/lib/gui/elistbox.cpp
index 6b2eace412f670e7d05d7a7c67b2b9dddfb1296f..c13114e83ebbf8bc93df4571ef0e6029a7b621d2 100644
(file)
--- a/
lib/gui/elistbox.cpp
+++ b/
lib/gui/elistbox.cpp
@@
-54,16
+54,10
@@
void eListbox::setWrapAround(bool state)
void eListbox::setContent(iListboxContent *content)
{
void eListbox::setContent(iListboxContent *content)
{
- int oldsel = m_selected;
m_content = content;
if (content)
m_content->setListbox(this);
entryReset();
m_content = 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();
}
bool eListbox::atBegin()
}
bool eListbox::atBegin()
@@
-285,7
+279,7
@@
void eListbox::updateScrollBar()
if ((pages*m_items_per_page) < entries)
++pages;
int start=(m_top*100)/(pages*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);
+ 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);
if (vis < 3)
vis=3;
m_scrollbar->setStartEnd(start,start+vis);
@@
-308,7
+302,7
@@
int eListbox::event(int event, void *data, void *data2)
if (!m_content)
return eWidget::event(event, data, data2);
if (!m_content)
return eWidget::event(event, data, data2);
-
assert
(m_content);
+
ASSERT
(m_content);
getStyle(style);
getStyle(style);
@@
-457,6
+451,7
@@
void eListbox::entryReset(bool selectionHome)
{
m_content_changed = true;
m_prev_scrollbar_page = -1;
{
m_content_changed = true;
m_prev_scrollbar_page = -1;
+ int oldsel;
if (selectionHome)
{
if (selectionHome)
{
@@
-473,10
+468,15
@@
void eListbox::entryReset(bool selectionHome)
else
m_selected = 0;
m_content->cursorSet(m_selected);
else
m_selected = 0;
m_content->cursorSet(m_selected);
- selectionChanged();
}
}
+ oldsel = m_selected;
moveSelection(justCheck);
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();
}
invalidate();
}