From 72afdc62f4ea865bdf7a3f316ec96bcb932c9d0a Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 23 Jul 2023 14:38:37 +0200 Subject: [PATCH] Fix so that we can change existing events to pulls. --- mainwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index b8322cb..05c5d71 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -231,7 +231,8 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, }); connect(ui->pull_or_was_d, &QPushButton::clicked, [this, events]() { EventsModel::Status s = events->get_status_at(ui->video->get_position()); - if (s.pull_state == EventsModel::Status::SHOULD_PULL) { + if (s.pull_state == EventsModel::Status::SHOULD_PULL || + events->get_status_at(ui->video->get_position() - 1).pull_state == EventsModel::Status::SHOULD_PULL) { set_current_event_type("pull"); } else if (s.pull_state == EventsModel::Status::PULL_IN_AIR) { insert_noplayer_event("pull_landed"); @@ -521,7 +522,8 @@ void MainWindow::update_action_buttons(uint64_t t) ui->throwaway->setText("Throwaway (&t)"); ui->throwaway->setShortcut(QCoreApplication::translate("MainWindow", "T", nullptr)); - if (s.pull_state == EventsModel::Status::SHOULD_PULL) { + if (s.pull_state == EventsModel::Status::SHOULD_PULL || + (has_selection_with_player && events->get_status_at(ui->video->get_position() - 1).pull_state == EventsModel::Status::SHOULD_PULL)) { // Can change this event to pull. ui->pull_or_was_d->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player); ui->their_pull->setEnabled(s.attack_state == EventsModel::Status::OFFENSE); -- 2.39.2