X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e8ae3b7fbbf12a0b5b87716f980ae287f330b85d..672640e924d5c61ec03919b977d38fa2783ad1c8:/lib/gui/eslider.cpp

diff --git a/lib/gui/eslider.cpp b/lib/gui/eslider.cpp
index f699389a..19097ad4 100644
--- a/lib/gui/eslider.cpp
+++ b/lib/gui/eslider.cpp
@@ -1,10 +1,15 @@
 #include <lib/gui/eslider.h>
 
 eSlider::eSlider(eWidget *parent)
-	:eWidget(parent), m_have_border_color(false), m_start(0), m_orientation(orHorizontal), m_border_width(0)
+	:eWidget(parent), m_have_border_color(false), m_start(0), m_orientation(orHorizontal), m_orientation_swapped(0), m_border_width(0)
 {
 }
 
+void eSlider::setPixmap(ePtr<gPixmap> &pixmap)
+{
+	setPixmap(pixmap.operator->());
+}
+
 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;
-		gPainter &painter = *(gPainter*)data2;
 
 		eSize s(size());
-
 		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
-			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)
@@ -63,10 +70,14 @@ int eSlider::event(int event, void *data, void *data2)
 
 		if (m_min < m_max)
 		{
-			num_pix = pixsize * (m_value - m_start) / (m_max - m_min);
-			start_pix = pixsize * m_start / (m_max - m_min);
+			int val_range = m_max - m_min;
+			num_pix = (pixsize * (m_value - m_start) + val_range - 1) / val_range; /* properly round up */
+			start_pix = (pixsize * m_start + val_range - 1) / val_range;
+
+			if (m_orientation_swapped)
+				start_pix = pixsize - num_pix - start_pix;
 		}
-		
+
 		if  (start_pix < 0)
 		{
 			num_pix += start_pix;
@@ -106,9 +117,10 @@ void eSlider::setStartEnd(int start, int end)
 	event(evtChangedSlider);
 }
 
-void eSlider::setOrientation(int orientation)
+void eSlider::setOrientation(int orientation, int swapped)
 {
 	m_orientation = orientation;
+	m_orientation_swapped = swapped;
 	event(evtChangedSlider);
 }