Skip to content
Snippets Groups Projects
Commit b1297eb1 authored by Anthony Noir's avatar Anthony Noir
Browse files

Merge branch 'master' of...

parents d4c87677 12077fb8
No related branches found
No related tags found
No related merge requests found
Pipeline #79691 passed
...@@ -750,9 +750,12 @@ void MainWindow::play_snake() ...@@ -750,9 +750,12 @@ void MainWindow::play_snake()
on_pushButton_clicked(); // reset la grille on_pushButton_clicked(); // reset la grille
QWidget::grabKeyboard();
static auto restore = [&] static auto restore = [&]
{ {
ui_update_alphabet(simulation.getAlphabet()); ui_update_alphabet(simulation.getAlphabet());
QWidget::releaseKeyboard();
snake_timer.stop(); snake_timer.stop();
on_pushButton_clicked(); // reset la grille on_pushButton_clicked(); // reset la grille
}; };
...@@ -889,26 +892,26 @@ void MainWindow::closeEvent(QCloseEvent *e) ...@@ -889,26 +892,26 @@ void MainWindow::closeEvent(QCloseEvent *e)
void MainWindow::keyPressEvent(QKeyEvent *event) void MainWindow::keyPressEvent(QKeyEvent *event)
{ {
if (event->key() == Qt::Key_Q) if (event->key() == Qt::Key_Q || event->key() == Qt::Key_Left)
m_arrow_key_state[0] = true; m_arrow_key_state[0] = true;
if (event->key() == Qt::Key_S) if (event->key() == Qt::Key_S || event->key() == Qt::Key_Down)
m_arrow_key_state[1] = true; m_arrow_key_state[1] = true;
if (event->key() == Qt::Key_D) if (event->key() == Qt::Key_D || event->key() == Qt::Key_Right)
m_arrow_key_state[2] = true; m_arrow_key_state[2] = true;
if (event->key() == Qt::Key_Z) if (event->key() == Qt::Key_Z || event->key() == Qt::Key_Up)
m_arrow_key_state[3] = true; m_arrow_key_state[3] = true;
QMainWindow::keyPressEvent(event); QMainWindow::keyPressEvent(event);
} }
void MainWindow::keyReleaseEvent(QKeyEvent *event) void MainWindow::keyReleaseEvent(QKeyEvent *event)
{ {
if (event->key() == Qt::Key_Q) if (event->key() == Qt::Key_Q || event->key() == Qt::Key_Left)
m_arrow_key_state[0] = false; m_arrow_key_state[0] = false;
if (event->key() == Qt::Key_S) if (event->key() == Qt::Key_S || event->key() == Qt::Key_Down)
m_arrow_key_state[1] = false; m_arrow_key_state[1] = false;
if (event->key() == Qt::Key_D) if (event->key() == Qt::Key_D || event->key() == Qt::Key_Right)
m_arrow_key_state[2] = false; m_arrow_key_state[2] = false;
if (event->key() == Qt::Key_Z) if (event->key() == Qt::Key_Z || event->key() == Qt::Key_Up)
m_arrow_key_state[3] = false; m_arrow_key_state[3] = false;
QMainWindow::keyReleaseEvent(event); QMainWindow::keyReleaseEvent(event);
} }
......
...@@ -3,11 +3,6 @@ QT += core gui ...@@ -3,11 +3,6 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
equals(QT_MAJOR_VERSION, 5): QT += multimedia equals(QT_MAJOR_VERSION, 5): QT += multimedia
!versionAtLeast(QT_VERSION, 5.14.0) {
message("Cannot use Qt $${QT_VERSION}")
error("Use Qt 5.14 or newer")
}
CONFIG += c++14 CONFIG += c++14
TEMPLATE = app TEMPLATE = app
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment