git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blink frontpanel led when record is running
[enigma2.git]
/
lib
/
gui
/
elistboxcontent.cpp
diff --git
a/lib/gui/elistboxcontent.cpp
b/lib/gui/elistboxcontent.cpp
index 2278db1611e6101509325e9b510c673dfdf3ddc0..585d6fec3dd6a73abf0064c92eb926f8efe5fb2c 100644
(file)
--- a/
lib/gui/elistboxcontent.cpp
+++ b/
lib/gui/elistboxcontent.cpp
@@
-262,7
+262,8
@@
void eListboxPythonStringContent::invalidate()
int s = size();
if ( m_cursor >= s )
m_listbox->moveSelectionTo(s?s-1:0);
int s = size();
if ( m_cursor >= s )
m_listbox->moveSelectionTo(s?s-1:0);
- m_listbox->invalidate();
+ else
+ m_listbox->invalidate();
}
}
}
}
@@
-430,6
+431,8
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
if (plist && PyList_Check(plist))
entries = PyList_Size(plist);
if (plist && PyList_Check(plist))
entries = PyList_Size(plist);
+ int left=0, right=0, last=-1;
+ eRect bbox;
for (int i = 0; i < entries; ++i)
{
ePyObject entry = PyList_GET_ITEM(plist, i);
for (int i = 0; i < entries; ++i)
{
ePyObject entry = PyList_GET_ITEM(plist, i);
@@
-439,15
+442,23
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
eWarning("glyph index %d in PythonConfigList out of bounds!", num);
else
{
eWarning("glyph index %d in PythonConfigList out of bounds!", num);
else
{
+ if (last+1 != num && last != -1) {
+ bbox = eRect(left, offset.y(), right-left, m_itemsize.height());
+ painter.fill(bbox);
+ }
para->setGlyphFlag(num, GS_INVERT);
para->setGlyphFlag(num, GS_INVERT);
- eRect bbox;
bbox = para->getGlyphBBox(num);
bbox = para->getGlyphBBox(num);
- bbox = eRect(bbox.left(), offset.y(), bbox.width(), m_itemsize.height());
- painter.fill(bbox);
+ if (last+1 != num || last == -1)
+ left = bbox.left();
+ right = bbox.left() + bbox.width();
+ last = num;
}
/* entry is borrowed */
}
}
/* entry is borrowed */
}
-
+ if (last != -1) {
+ bbox = eRect(left, offset.y(), right-left, m_itemsize.height());
+ painter.fill(bbox);
+ }
painter.renderPara(para, ePoint(0, 0));
/* pvalue is borrowed */
/* plist is 0 or borrowed */
painter.renderPara(para, ePoint(0, 0));
/* pvalue is borrowed */
/* plist is 0 or borrowed */
@@
-576,7
+587,7
@@
static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
{
if (pforeColorSelected)
{
{
if (pforeColorSelected)
{
- int color = PyInt_AsLong(pforeColor);
+ int color = PyInt_AsLong(pforeColor
Selected
);
painter.setForegroundColor(gRGB(color));
}
/* if we have a local foreground color set, use that. */
painter.setForegroundColor(gRGB(color));
}
/* if we have a local foreground color set, use that. */
@@
-765,8
+776,6
@@
void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
int color = PyInt_AsLong(pborderColor);
painter.setForegroundColor(gRGB(color));
}
int color = PyInt_AsLong(pborderColor);
painter.setForegroundColor(gRGB(color));
}
- else if (pforeColor) // reset to normal color
- style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
rect.setRect(x, y, width, bwidth);
painter.fill(rect);
rect.setRect(x, y, width, bwidth);
painter.fill(rect);
@@
-1023,3
+1032,9
@@
void eListboxPythonMultiContent::updateClip(gRegion &clip)
else
m_old_clip = m_clip = gRegion::invalidRegion();
}
else
m_old_clip = m_clip = gRegion::invalidRegion();
}
+
+void eListboxPythonMultiContent::entryRemoved(int idx)
+{
+ if (m_listbox)
+ m_listbox->entryRemoved(idx);
+}