X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8ade23537a682d4b0c9709d533b25702bde2ee23..82afad7661dffa00f29c80cbe4e9865ace1e0730:/lib/gui/eslider.cpp

diff --git a/lib/gui/eslider.cpp b/lib/gui/eslider.cpp
index 665c6c1c..37b67acf 100644
--- a/lib/gui/eslider.cpp
+++ b/lib/gui/eslider.cpp
@@ -1,9 +1,23 @@
 #include <lib/gui/eslider.h>
 
-eSlider::eSlider(eWidget *parent): eWidget(parent)
+eSlider::eSlider(eWidget *parent)
+	:eWidget(parent), m_have_border_color(false), m_start(0), m_orientation(orHorizontal), m_border_width(0)
 {
 }
 
+void eSlider::setBorderWidth(int pixel)
+{
+	m_border_width=pixel;
+	invalidate();
+}
+
+void eSlider::setBorderColor(const gRGB &color)
+{
+	m_border_color=color;
+	m_have_border_color=true;
+	invalidate();
+}
+
 int eSlider::event(int event, void *data, void *data2)
 {
 	switch (event)
@@ -12,24 +26,51 @@ int eSlider::event(int event, void *data, void *data2)
 	{
 		ePtr<eWindowStyle> style;
 		gPainter &painter = *(gPainter*)data2;
-		
-		
+
+		eSize s(size());
+
 		getStyle(style);
-		style->paintBackground(painter, ePoint(0, 0), size());
+		style->paintBackground(painter, ePoint(0,0), s);
 		style->setStyle(painter, eWindowStyle::styleLabel); // TODO - own style
 		painter.fill(m_currently_filled);
-		
+
+// border
+		if (m_have_border_color)
+			painter.setForegroundColor(m_border_color);
+		painter.fill(eRect(0, 0, s.width(), m_border_width));
+		painter.fill(eRect(0, m_border_width, m_border_width, s.height()-m_border_width));
+		painter.fill(eRect(m_border_width, s.height()-m_border_width, s.width()-m_border_width, m_border_width));
+		painter.fill(eRect(s.width()-m_border_width, m_border_width, m_border_width, s.height()-m_border_width));
+
 		return 0;
 	}
 	case evtChangedSlider:
 	{
+		int num_pix = 0, start_pix = 0;
+		gRegion old_currently_filled = m_currently_filled;
+
+		int pixsize = (m_orientation == orHorizontal) ? size().width() : size().height();
 
-		int num_pix = 0;
 		if (m_min < m_max)
-			num_pix = size().width() * m_value / (m_max - m_min);
-		gRegion old_currently_filled = m_currently_filled;
-		m_currently_filled = eRect(0, 0, num_pix, size().height());
+		{
+			num_pix = pixsize * (m_value - m_start) / (m_max - m_min);
+			start_pix = pixsize * m_start / (m_max - m_min);
+		}
 		
+		if  (start_pix < 0)
+		{
+			num_pix += start_pix;
+			start_pix = 0;
+		}
+		
+		if (num_pix < 0)
+			num_pix = 0;
+
+		if (m_orientation == orHorizontal)
+			m_currently_filled = eRect(start_pix, 0, num_pix, pixsize);
+		else
+			m_currently_filled = eRect(0, start_pix, pixsize, num_pix);
+
 			// redraw what *was* filled before and now isn't.
 		invalidate(m_currently_filled - old_currently_filled);
 			// redraw what wasn't filled before and is now.
@@ -48,6 +89,19 @@ void eSlider::setValue(int value)
 	event(evtChangedSlider);
 }
 
+void eSlider::setStartEnd(int start, int end)
+{
+	m_value = end;
+	m_start = start;
+	event(evtChangedSlider);
+}
+
+void eSlider::setOrientation(int orientation)
+{
+	m_orientation = orientation;
+	event(evtChangedSlider);
+}
+
 void eSlider::setRange(int min, int max)
 {
 	m_min = min;