git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add "Blink" option to ConditionalShowHide
[enigma2.git]
/
lib
/
gui
/
eslider.cpp
diff --git
a/lib/gui/eslider.cpp
b/lib/gui/eslider.cpp
index f699389afb0db9aa0aaf69a23da57202a0f8517f..dd2aac9e73c329b9f3eb64ad73ae30c84263719b 100644
(file)
--- a/
lib/gui/eslider.cpp
+++ b/
lib/gui/eslider.cpp
@@
-5,6
+5,11
@@
eSlider::eSlider(eWidget *parent)
{
}
{
}
+void eSlider::setPixmap(ePtr<gPixmap> &pixmap)
+{
+ setPixmap(pixmap.operator->());
+}
+
void eSlider::setPixmap(gPixmap *pixmap)
{
m_pixmap = pixmap;
void eSlider::setPixmap(gPixmap *pixmap)
{
m_pixmap = pixmap;
@@
-31,18
+36,20
@@
int eSlider::event(int event, void *data, void *data2)
case evtPaint:
{
ePtr<eWindowStyle> style;
case evtPaint:
{
ePtr<eWindowStyle> style;
- gPainter &painter = *(gPainter*)data2;
eSize s(size());
eSize s(size());
-
getStyle(style);
getStyle(style);
- style->paintBackground(painter, ePoint(0,0), s);
+ /* paint background */
+ eWidget::event(evtPaint, data, data2);
+
+ gPainter &painter = *(gPainter*)data2;
+
style->setStyle(painter, eWindowStyle::styleLabel); // TODO - own style
if (!m_pixmap)
painter.fill(m_currently_filled);
else
style->setStyle(painter, eWindowStyle::styleLabel); // TODO - own style
if (!m_pixmap)
painter.fill(m_currently_filled);
else
- painter.blit(m_pixmap, ePoint(0, 0), m_currently_filled.extends);
+ painter.blit(m_pixmap, ePoint(0, 0), m_currently_filled.extends
, isTransparent() ? gPainter::BT_ALPHATEST : 0
);
// border
if (m_have_border_color)
// border
if (m_have_border_color)