X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/44433f650cd3e5f9f66253b74d194fcb01578595..1c242c0a654a5c4048ba4219a0982f8ba8a85246:/lib/gui/epixmap.cpp

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 797c6759..84fec323 100644
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -2,25 +2,55 @@
 #include <lib/gdi/epng.h>
 #include <lib/gui/ewidgetdesktop.h>
 
-ePixmap::ePixmap(eWidget *parent): eWidget(parent)
+ePixmap::ePixmap(eWidget *parent)
+	:eWidget(parent), m_alphatest(false)
 {
 }
 
+void ePixmap::setAlphatest(int alphatest)
+{
+	m_alphatest = alphatest;
+	setTransparent(alphatest);
+}
+
 void ePixmap::setPixmap(gPixmap *pixmap)
 {
 	m_pixmap = pixmap;
 	event(evtChangedPixmap);
 }
 
+void ePixmap::setPixmap(ePtr<gPixmap> &pixmap)
+{
+	m_pixmap = pixmap;
+	event(evtChangedPixmap);
+}
+
 void ePixmap::setPixmapFromFile(const char *filename)
 {
 	loadPNG(m_pixmap, filename);
 	
-		// TODO
-	getDesktop()->makeCompatiblePixmap(*m_pixmap);
+	if (!m_pixmap)
+	{
+		eDebug("ePixmap::setPixmapFromFile: loadPNG failed");
+		return;
+	}
+	
+		// TODO: This only works for desktop 0
+	getDesktop(0)->makeCompatiblePixmap(*m_pixmap);
 	event(evtChangedPixmap);
 }
 
+void ePixmap::checkSize()
+{
+			/* when we have no pixmap, or a pixmap of different size, we need 
+	   to enable transparency in any case. */
+	if (m_pixmap && m_pixmap->size() == size() && !m_alphatest)
+		setTransparent(0);
+	else
+		setTransparent(1);
+		/* fall trough. */
+}
+
 int ePixmap::event(int event, void *data, void *data2)
 {
 	switch (event)
@@ -30,18 +60,34 @@ int ePixmap::event(int event, void *data, void *data2)
 		ePtr<eWindowStyle> style;
 		
 		getStyle(style);
-		
-		eWidget::event(event, data, data2);
-		
+
+//	we don't clear the background before because of performance reasons.
+//	when the pixmap is too small to fit the whole widget area, the widget is
+//	transparent anyway, so the background is already painted.
+//		eWidget::event(event, data, data2); 
+
 		gPainter &painter = *(gPainter*)data2;
 		if (m_pixmap)
-			painter.blit(m_pixmap, ePoint(0, 0));
-		
+		{
+			int flags = 0;
+			if (m_alphatest == 0)
+				flags = 0;
+			else if (m_alphatest == 1)
+				flags = gPainter::BT_ALPHATEST;
+			else if (m_alphatest == 2)
+				flags = gPainter::BT_ALPHABLEND;
+			painter.blit(m_pixmap, ePoint(0, 0), eRect(), flags);
+		}
+
 		return 0;
 	}
 	case evtChangedPixmap:
+		checkSize();
 		invalidate();
 		return 0;
+	case evtChangedSize:
+		checkSize();
+			/* fall trough. */
 	default:
 		return eWidget::event(event, data, data2);
 	}