1 files changed, 4 insertions, 0 deletions
diff --git a/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp b/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
index f03d0ec..f67a4b8 100644
--- a/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
+++ b/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
@@ -60,60 +60,64 @@ QSize QtGridSelectionDialog::getMinGridSize() const {
 }
 
 void QtGridSelectionDialog::setMaxGridSize(const QSize& size) {
     maxGridSize = size;
     emit maxGridSizeChanged(size);
 }
 
 QSize QtGridSelectionDialog::getMaxGridSize() const {
     return maxGridSize;
 }
 
 void QtGridSelectionDialog::keyReleaseEvent(QKeyEvent* event) {
     if (event) {
         QSize newGridSize = currentGridSize;
         if (event->key() == Qt::Key_Up) {
             newGridSize += QSize(0, -1);
         }
         else if (event->key() == Qt::Key_Down) {
             newGridSize += QSize(0, 1);
         }
         else if (event->key() == Qt::Key_Left) {
             newGridSize += QSize(-1, 0);
         }
         else if (event->key() == Qt::Key_Right) {
             newGridSize += QSize(1, 0);
         }
         else if (event->key() == Qt::Key_Return) {
             hide();
             setCurrentGridSize(currentGridSize);
         }
+        else if (event->key() == Qt::Key_Escape) {
+            hide();
+        }
+
         if (minGridSize.expandedTo(newGridSize).boundedTo(maxGridSize) != currentGridSize) {
             currentGridSize = minGridSize.expandedTo(newGridSize).boundedTo(maxGridSize);
 
             QSize newSizeHint = sizeHint();
             resize(newSizeHint);
             QCursor::setPos(mapToGlobal(QPoint(newSizeHint.width(), newSizeHint.height()) - QPoint(frameSize.width() / 2, frameSize.height() / 2)));
         }
     }
 }
 
 void QtGridSelectionDialog::mousePressEvent(QMouseEvent*) {
     hide();
     setCurrentGridSize(currentGridSize);
 }
 
 void QtGridSelectionDialog::paintEvent(QPaintEvent*) {
     QPainter painter(this);
     // draw grid
     QRect gridCell = QRect(QPoint(0,0), frameSize);
     painter.setBrush(palette().highlight());
     painter.setPen(Qt::NoPen);
     for (int x = 0; x < currentGridSize.width(); x++) {
         for (int y = 0; y < currentGridSize.height(); y++) {
             int xPos = horizontalMargin + (x * (frameSize.width() + padding));
             int yPos = verticalMargin + (y * (frameSize.height() + padding));
             gridCell.moveTo(QPoint(xPos, yPos));
             painter.drawRect(gridCell);
         }
     }