X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6c402c27ba2c8cc2c7c6bb6f5fbb0c2d2d0c0f8b..6fdb2d2094c50a2bc324f4094473c2107d2ea943:/lib/gui/epositiongauge.cpp

diff --git a/lib/gui/epositiongauge.cpp b/lib/gui/epositiongauge.cpp
index 0adda5db..ff98c080 100644
--- a/lib/gui/epositiongauge.cpp
+++ b/lib/gui/epositiongauge.cpp
@@ -6,6 +6,7 @@ ePositionGauge::ePositionGauge(eWidget *parent)
 {
 	m_point_widget = new ePixmap(this);
 	m_seek_point_widget = new ePixmap(this);
+	m_seek_point_widget->hide();
 	m_point_widget->setAlphatest(1);
 	m_seek_point_widget->setAlphatest(1);
 	m_position = 0;
@@ -42,6 +43,11 @@ void ePositionGauge::setInColor(const gRGB &color)
 	invalidate();
 }
 
+void ePositionGauge::setPointer(int which, ePtr<gPixmap> &pixmap, const ePoint &center)
+{
+	setPointer(which, pixmap.operator->(), center);
+}
+
 void ePositionGauge::setPointer(int which, gPixmap *pixmap, const ePoint &center)
 {
 	if (which == 0)
@@ -58,7 +64,7 @@ void ePositionGauge::setPointer(int which, gPixmap *pixmap, const ePoint &center
 	updatePosition();
 }
 
-void ePositionGauge::setInOutList(PyObject *list)
+void ePositionGauge::setInOutList(ePyObject list)
 {
 	if (!PyList_Check(list))
 		return;
@@ -69,14 +75,14 @@ void ePositionGauge::setInOutList(PyObject *list)
 	
 	for (i=0; i<size; ++i)
 	{
-		PyObject *tuple = PyList_GetItem(list, i);
+		ePyObject tuple = PyList_GET_ITEM(list, i);
 		if (!PyTuple_Check(tuple))
 			continue;
 
 		if (PyTuple_Size(tuple) != 2)
 			continue;
 
-		PyObject *ppts = PyTuple_GetItem(tuple, 0), *ptype = PyTuple_GetItem(tuple, 1);
+		ePyObject ppts = PyTuple_GET_ITEM(tuple, 0), ptype = PyTuple_GET_ITEM(tuple, 1);
 		if (!(PyLong_Check(ppts) && PyInt_Check(ptype)))
 			continue;
 
@@ -120,13 +126,17 @@ int ePositionGauge::event(int event, void *data, void *data2)
 					continue;
 				} else if (i->what == 1) /* out */
 					out = i++->where;
-				else /* mark */
+				else if (i->what == 2) /* mark */
 				{
 					int xm = scale(i->where);
 					painter.setForegroundColor(gRGB(0xFF8080));
 					painter.fill(eRect(xm - 2, 0, 4, s.height()));
 					i++;
 					continue;
+				} else /* other marker, like last position */
+				{
+					++i;
+					continue;
 				}
 			}
 			
@@ -134,7 +144,7 @@ int ePositionGauge::event(int event, void *data, void *data2)
 			{
 				painter.setForegroundColor(gRGB(m_foreground_color));
 				int xi = scale(in), xo = scale(out);
-				painter.fill(eRect(xi, 10, xo-xi, s.height()-14));
+				painter.fill(eRect(xi, (s.height()-4) / 2, xo-xi, 4));
 			}
 			
 			in = m_length;