X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c5f61282a2391235e05ff40bc40a2f0852ea1a9f..24ac423a92cf63ed6a8a09fa1ef48bef2c9382a6:/lib/gui/epixmap.cpp

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 3a377f14..69da944c 100644
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -10,6 +10,7 @@ ePixmap::ePixmap(eWidget *parent)
 void ePixmap::setAlphatest(bool alphatest)
 {
 	m_alphatest = alphatest;
+	setTransparent(alphatest);
 }
 
 void ePixmap::setPixmap(gPixmap *pixmap)
@@ -18,15 +19,38 @@ void ePixmap::setPixmap(gPixmap *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)
@@ -36,8 +60,11 @@ 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 fix 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)
@@ -46,8 +73,12 @@ int ePixmap::event(int event, void *data, void *data2)
 		return 0;
 	}
 	case evtChangedPixmap:
+		checkSize();
 		invalidate();
 		return 0;
+	case evtChangedSize:
+		checkSize();
+			/* fall trough. */
 	default:
 		return eWidget::event(event, data, data2);
 	}