- fixed blit in gRC

 - enable use of loadPNG trough python (something is still broken, sorry)
 - add ePixmap
 - dummy widgets now possible as pixmaps

4 files changed, 11 insertions, 4 deletions

diff --git a/lib/gdi/epng.h b/lib/gdi/epng.h
index 244019f3..09f30233 100644
--- a/lib/gdi/epng.h
+++ b/lib/gdi/epng.h
@@ -1,7 +1,7 @@
 #ifndef __png_h
 #define __png_h
 
-#include "grc.h"
+#include <lib/gdi/gpixmap.h>
 
 int loadPNG(ePtr<gPixmap> &pixmap, const char *filename);
 int savePNG(const char *filename, gPixmap *pixmap);
diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp
index c2c75e7a..fe0c0a1f 100644
--- a/lib/gdi/gpixmap.cpp
+++ b/lib/gdi/gpixmap.cpp
@@ -147,7 +147,7 @@ void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
 
 		eRect srcarea=area;
 		srcarea.moveBy(-pos.x(), -pos.y());
-
+		
 		if ((surface->bpp == 8) && (src.surface->bpp==8))
 		{
 			__u8 *srcptr=(__u8*)src.surface->data;
diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index e549787c..f29a0fe7 100644
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -128,4 +128,6 @@ public:
 	virtual ~gPixmap();
 };
 
+TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
+
 #endif
diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index e7748967..3b5476a2 100644
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -188,7 +188,7 @@ void gPainter::clear()
 void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 {
 	gOpcode o;
-
+	
 	o.opcode=gOpcode::blit;
 	o.dc = m_dc.grabRef();
 	pixmap->AddRef();
@@ -398,11 +398,16 @@ void gDC::exec(gOpcode *o)
 	case gOpcode::blit:
 	{
 		gRegion clip;
-		if (!o->parm.blit->clip.valid())
+				// this code should be checked again but i'm too tired now
+		
+		o->parm.blit->position += m_current_offset;
+		
+		if (o->parm.blit->clip.valid())
 		{
 			clip.intersect(gRegion(o->parm.blit->clip), clip);
 		} else
 			clip = m_current_clip;
+		
 		m_pixmap->blit(*o->parm.blit->pixmap, o->parm.blit->position, clip, o->parm.blit->flags);
 		o->parm.blit->pixmap->Release();
 		delete o->parm.blit;