X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fcontrollerwidget.cpp;h=fd9ebf24bee74952235e38e458c5a15c0054a407;hb=2136446c0d38d00a651d3eb665ee564b18f94b28;hp=c5167b131c1d30b1bb134222fb1518e6f4ab2fd0;hpb=0c6ed444bbb07e5cc0513a7d3075fb24d06e61eb;p=virtualjaguar diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp index c5167b1..fd9ebf2 100644 --- a/src/gui/controllerwidget.cpp +++ b/src/gui/controllerwidget.cpp @@ -25,7 +25,7 @@ char ControllerWidget::keyName1[96][16] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ":", ";", "<", "=", ">", "?", "@", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", - "[", "]", "\\", "^", "_", "`", + "[", "\\", "]", "^", "_", "`", "$61", "$62", "$63", "$64", "$65", "$66", "$67", "$68", "$69", "$6A", "$6B", "$6C", "$6D", "$6E", "$6F", "$70", "$71", "$72", "$73", "$74", "$75", "$76", "$77", "$78", "$79", "$7A", "{", "|", "}", "~" @@ -132,13 +132,13 @@ void ControllerWidget::paintEvent(QPaintEvent * /*event*/) } } -void ControllerWidget::mousePressEvent(QMouseEvent * event) +void ControllerWidget::mousePressEvent(QMouseEvent * /*event*/) { mouseDown = true; update(); } -void ControllerWidget::mouseReleaseEvent(QMouseEvent * event) +void ControllerWidget::mouseReleaseEvent(QMouseEvent * /*event*/) { mouseDown = false; // Spawning the keygrabber causes leaveEvent() to be called, so we need to save this @@ -164,7 +164,6 @@ void ControllerWidget::mouseMoveEvent(QMouseEvent * event) // Save the current closest item int keyToHighlightOld = keyToHighlight; // Set up closest distance (this should be large enough) -// uint32_t closestX = 100000, closestY = 100000; double closest = 1e9; for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++) @@ -188,7 +187,6 @@ void ControllerWidget::mouseMoveEvent(QMouseEvent * event) void ControllerWidget::leaveEvent(QEvent * /*event*/) { keyToHighlight = -1; -// mouseDown = false; update(); }