git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix deprecated conversion from string constant to char* by using const char* instead...
[enigma2.git]
/
lib
/
gui
/
elistbox.cpp
diff --git
a/lib/gui/elistbox.cpp
b/lib/gui/elistbox.cpp
index c7a46baaef497e04ffe415129fd504d72fa6f7bc..d4c653fe628cbda167f9c767895f7278a7818af8 100644
(file)
--- a/
lib/gui/elistbox.cpp
+++ b/
lib/gui/elistbox.cpp
@@
-99,7
+99,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)
{
/* refuse to do anything without a valid list. */
if (!m_content)
@@
-360,7
+360,7
@@
int eListbox::event(int event, void *data, void *data2)
case evtAction:
if (isVisible())
{
case evtAction:
if (isVisible())
{
- moveSelection((
int
)data2);
+ moveSelection((
long
)data2);
return 1;
}
return 0;
return 1;
}
return 0;
@@
-432,7
+432,10
@@
void eListbox::entryRemoved(int index)
if (index == m_selected && m_content)
m_selected = m_content->cursorGet();
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)))
{
if ((m_top <= index) && (index < (m_top + m_items_per_page)))
{
@@
-483,12
+486,24
@@
void eListbox::setBackgroundColor(gRGB &col)
m_style.m_background_color_set = 1;
}
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::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<gPixmap> &pm)
{
m_style.m_background = pm;
void eListbox::setBackgroundPicture(ePtr<gPixmap> &pm)
{
m_style.m_background = pm;