X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Ftoolwindow.cpp;h=5fd774c1498430542df30b7ec84403e2afaf2041;hb=3ef71393f70213eb53db552605ae3c93f1303ee9;hp=75eaa0e1a3c129aec0d176ac9f7979e0cfb1c956;hpb=3599953dec39d0ae662b039378a0b3eda39424e8;p=ttedit

diff --git a/src/toolwindow.cpp b/src/toolwindow.cpp
index 75eaa0e..5fd774c 100755
--- a/src/toolwindow.cpp
+++ b/src/toolwindow.cpp
@@ -29,12 +29,13 @@
 ToolWindow::ToolWindow(void): QWidget(NULL, Qt::Window | Qt::FramelessWindowHint),
 	prevTool(TOOLNone)
 {
-	img = QImage(":/res/toolpal1.xpm");
+//	img = QImage(":/res/toolpal1.xpm");
+	img = QImage(":/res/toolpal1.png");
 
 	// Set up sizes
 
 	sizeTPBM.rx() = img.width(), sizeTPBM.ry() = img.height();
-	sizeStamp.rx() = sizeTPBM.x() / 4, sizeStamp.ry() = sizeTPBM.y() / 2;
+	sizeStamp.rx() = sizeTPBM.x() / 4, sizeStamp.ry() = sizeTPBM.y() / 3;
 
 	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 	setVisible(false);
@@ -54,7 +55,8 @@ void ToolWindow::paintEvent(QPaintEvent * event)
 	{
 	    //need ul corner of bitmap, ul corner of dest, width/height
 		p.setCompositionMode(QPainter::RasterOp_NotSource);
-		QPoint pt(sizeStamp.x() * (prevTool & 0x03), sizeStamp.y() * (prevTool >> 2));
+//		QPoint pt(sizeStamp.x() * (prevTool & 0x03), sizeStamp.y() * (prevTool >> 2));
+		QPoint pt(sizeStamp.x() * (prevTool % 4), sizeStamp.y() * (prevTool / 4));
 		p.drawImage(pt.x(), pt.y(), img, pt.x(), pt.y(), sizeStamp.x(), sizeStamp.y());
 	}
 }
@@ -76,8 +78,12 @@ ToolType ToolWindow::FindSelectedTool(void)
 	ToolType newTool = TOOLNone;
 
 	// NOTE: This works because x and y are UNSIGNED
-	if (x < 4 && y < 2)
+	if (x < 4 && y < 3)
 		newTool = (ToolType)((y * 4) + x);
 
+	// We don't have 11 yet, so fix this if the user selected the blank space
+	if (newTool > 10)
+		newTool = TOOLNone;
+
 	return newTool;
 }