git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f725f69
)
elistboxcontent.cpp: revert "cleanup" part of the commit "elistboxcontent.cpp: code...
author
ghost
<andreas.monzner@multimedia-labs.de>
Thu, 2 Apr 2009 18:04:39 +0000
(20:04 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Thu, 2 Apr 2009 18:04:39 +0000
(20:04 +0200)
lib/gui/elistboxcontent.cpp
patch
|
blob
|
history
diff --git
a/lib/gui/elistboxcontent.cpp
b/lib/gui/elistboxcontent.cpp
index 4da1618c5762e4c535e8c8079ca9896df1c69eb3..dccd1b05d31567ac203765dd0c5b87135b592b5a 100644
(file)
--- a/
lib/gui/elistboxcontent.cpp
+++ b/
lib/gui/elistboxcontent.cpp
@@
-182,7
+182,7
@@
void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
{
if (local_style->m_background && cursorValid)
painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
{
if (local_style->m_background && cursorValid)
painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
- else
+ else
if (selected && !local_style->m_selection)
painter.clear();
}
painter.clear();
}
@@
-319,7
+319,7
@@
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
{
if (local_style->m_background && cursorValid)
painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
{
if (local_style->m_background && cursorValid)
painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
- else
+ else
if (selected && !local_style->m_selection)
painter.clear();
}
painter.clear();
}
@@
-533,6
+533,8
@@
static void clearRegionHelper(gPainter &painter, eListboxStyle *local_style, con
painter.blit(local_style->m_background, offset, eRect(), 0);
return;
}
painter.blit(local_style->m_background, offset, eRect(), 0);
return;
}
+ else if (local_style->m_transparent_background)
+ return;
}
painter.clear();
}
}
painter.clear();
}
@@
-556,6
+558,8
@@
static void clearRegionSelectedHelper(gPainter &painter, eListboxStyle *local_st
painter.blit(local_style->m_background, offset, eRect(), 0);
return;
}
painter.blit(local_style->m_background, offset, eRect(), 0);
return;
}
+ else if (local_style->m_transparent_background)
+ return;
}
painter.clear();
}
}
painter.clear();
}
@@
-1002,7
+1006,7
@@
void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
}
}
}
}
- if (selected && (!local_style || !local_style->m_selection))
+ if (selected &&
!sel_clip.valid() &&
(!local_style || !local_style->m_selection))
style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
error_out:
style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
error_out:
@@
-1041,7
+1045,7
@@
int eListboxPythonMultiContent::currentCursorSelectable()
{
bool retval = ret == Py_True;
Py_DECREF(ret);
{
bool retval = ret == Py_True;
Py_DECREF(ret);
- return ret;
+ return ret
val
;
}
eDebug("call m_selectableFunc failed!!! assume not callable");
}
}
eDebug("call m_selectableFunc failed!!! assume not callable");
}