git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use green to add a timer directly from the epgSelection
[enigma2.git]
/
lib
/
gui
/
elistbox.cpp
diff --git
a/lib/gui/elistbox.cpp
b/lib/gui/elistbox.cpp
index f530019dd27a63cd24dcb6eb7781327a6d3ee303..0d92e10790ef9a9ce3d0e0b0db82d0d71e2f9cb2 100644
(file)
--- a/
lib/gui/elistbox.cpp
+++ b/
lib/gui/elistbox.cpp
@@
-1,20
+1,40
@@
- /* written by: Felix Domke <tmbinc@elitedvb.net> */
#include <lib/gui/elistbox.h>
#include <lib/gui/elistboxcontent.h>
#include <lib/gui/elistbox.h>
#include <lib/gui/elistboxcontent.h>
+#include <lib/actions/action.h>
eListbox::eListbox(eWidget *parent): eWidget(parent)
{
setContent(new eListboxStringContent());
eListbox::eListbox(eWidget *parent): eWidget(parent)
{
setContent(new eListboxStringContent());
+
+ ePtr<eActionMap> ptr;
+ eActionMap::getInstance(ptr);
+
+ m_itemheight = 25;
+
+ ptr->bindAction("ListboxActions", 0, 0, this);
+}
+
+eListbox::~eListbox()
+{
+ ePtr<eActionMap> ptr;
+ eActionMap::getInstance(ptr);
+ ptr->unbindAction(this, 0);
}
void eListbox::setContent(iListboxContent *content)
{
m_content = content;
}
void eListbox::setContent(iListboxContent *content)
{
m_content = content;
+ if (content)
+ m_content->setListbox(this);
entryReset();
}
void eListbox::moveSelection(int dir)
{
entryReset();
}
void eListbox::moveSelection(int dir)
{
+ /* refuse to do anything without a valid list. */
+ if (!m_content)
+ return;
+
/* we need the old top/sel to see what we have to redraw */
int oldtop = m_top;
int oldsel = m_selected;
/* we need the old top/sel to see what we have to redraw */
int oldtop = m_top;
int oldsel = m_selected;
@@
-31,17
+51,39
@@
void eListbox::moveSelection(int dir)
if (!m_content->cursorValid())
m_content->cursorMove(-1);
break;
if (!m_content->cursorValid())
m_content->cursorMove(-1);
break;
+ case pageUp:
+ if (m_content->cursorGet() >= m_items_per_page)
+ {
+ m_content->cursorMove(-m_items_per_page);
+ m_top -= m_items_per_page;
+ if (m_top < 0)
+ m_top = 0;
+ } else
+ {
+ m_top = 0;
+ m_content->cursorHome();
+ }
+ break;
case moveTop:
m_content->cursorHome();
m_top = 0; /* align with top, speeds up process */
break;
case moveTop:
m_content->cursorHome();
m_top = 0; /* align with top, speeds up process */
break;
+
+ case pageDown:
+ m_content->cursorMove(m_items_per_page);
+ if (m_content->cursorValid())
+ break;
+ /* fall through */
case moveEnd:
/* move to last existing one ("end" is already invalid) */
m_content->cursorEnd(); m_content->cursorMove(-1);
case moveEnd:
/* move to last existing one ("end" is already invalid) */
m_content->cursorEnd(); m_content->cursorMove(-1);
-
- m_top = m_content->cursorGet() - m_items_per_page + 1;
- if (m_top < 0)
- m_top = 0;
+ /* current selection invisible? */
+ if (m_top + m_items_per_page <= m_content->cursorGet())
+ {
+ m_top = m_content->cursorGet() - m_items_per_page + 1;
+ if (m_top < 0)
+ m_top = 0;
+ }
break;
case justCheck:
break;
break;
case justCheck:
break;
@@
-86,8
+128,9
@@
int eListbox::event(int event, void *data, void *data2)
{
ePtr<eWindowStyle> style;
{
ePtr<eWindowStyle> style;
+ if (!m_content)
+ return eWidget::event(event, data, data2);
assert(m_content);
assert(m_content);
- recalcSize(); // move to event
getStyle(style);
getStyle(style);
@@
-109,6
+152,17
@@
int eListbox::event(int event, void *data, void *data2)
return 0;
}
return 0;
}
+ case evtChangedSize:
+ recalcSize();
+ return eWidget::event(event, data, data2);
+
+ case evtAction:
+ if (isVisible())
+ {
+ moveSelection((int)data2);
+ return 1;
+ }
+ return 0;
default:
return eWidget::event(event, data, data2);
}
default:
return eWidget::event(event, data, data2);
}
@@
-116,11
+170,19
@@
int eListbox::event(int event, void *data, void *data2)
void eListbox::recalcSize()
{
void eListbox::recalcSize()
{
- m_itemheight = 20;
m_content->setSize(eSize(size().width(), m_itemheight));
m_items_per_page = size().height() / m_itemheight;
}
m_content->setSize(eSize(size().width(), m_itemheight));
m_items_per_page = size().height() / m_itemheight;
}
+void eListbox::setItemHeight(int h)
+{
+ if (h)
+ m_itemheight = h;
+ else
+ m_itemheight = 20;
+ recalcSize();
+}
+
void eListbox::entryAdded(int index)
{
/* manage our local pointers. when the entry was added before the current position, we have to advance. */
void eListbox::entryAdded(int index)
{
/* manage our local pointers. when the entry was added before the current position, we have to advance. */
@@
-168,9
+230,9
@@
void eListbox::entryChanged(int index)
void eListbox::entryReset()
{
void eListbox::entryReset()
{
- invalidate();
if (m_content)
m_content->cursorHome();
m_top = 0;
m_selected = 0;
if (m_content)
m_content->cursorHome();
m_top = 0;
m_selected = 0;
+ invalidate();
}
}