X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fcontrollerwidget.cpp;h=eb91c34274ea28666dbd020a8e7e74e522de395d;hb=eec77bddfd9b9169b23717cf3b37d182ca88bbc3;hp=79e91b602859c25b345b4fe1405db8535e624f8d;hpb=5c28b6dbf7aa20441c8a51f484f4f64b1966f7e3;p=virtualjaguar

diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp
index 79e91b6..eb91c34 100644
--- a/src/gui/controllerwidget.cpp
+++ b/src/gui/controllerwidget.cpp
@@ -44,6 +44,8 @@ char ControllerWidget::keyName2[64][16] = {
 
 char ControllerWidget::hatName[4][16] = { "Up", "Rt", "Dn", "Lf" };
 
+char ControllerWidget::axisName[2][8] = { "+", "-" };
+
 // This is hard-coded crap. It's crap-tastic!
 // These are the positions to draw the button names at, ordered by the BUTTON_* sequence
 // found in joystick.h.
@@ -63,6 +65,8 @@ ControllerWidget::ControllerWidget(QWidget * parent/*= 0*/): QWidget(parent),
 	widgetSize += QSize(4, 4);
 	// We want to know when the mouse is moving over our widget...
 	setMouseTracking(true);
+//nope
+//setFixedSize(widgetSize);
 }
 
 
@@ -147,6 +151,11 @@ void ControllerWidget::paintEvent(QPaintEvent * /*event*/)
 			DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
 				QString("j%1").arg(hatName[keys[i] & JOY_BUTTON_MASK]));
 		}
+		else if (keys[i] & JOY_AXIS)
+		{
+			DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1],
+				QString("JA%1%2").arg((keys[i] & JOY_AXISNUM_MASK) >> 1).arg(axisName[keys[i] & JOY_AXISDIR_MASK]));
+		}
 #endif
 		else
 			DrawBorderedText(painter, buttonPos[i][0], buttonPos[i][1], QString("???"));