From 2d8f01b2e95e227d90c2be9d3e5d804fa3fcdc92 Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Mon, 11 Mar 2019 00:33:19 +0100 Subject: [PATCH] Show current counter value on "set counter" dialog (#3650) * fix point 10 of issue #655 * clanfigyism --- cockatrice/src/player.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index e400246a..4c21bcde 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -2855,8 +2855,14 @@ void Player::actCardCounterTrigger() case 11: { // set counter with dialog bool ok; dialogSemaphore = true; - int number = - QInputDialog::getInt(nullptr, tr("Set counters"), tr("Number:"), 0, 0, MAX_COUNTERS_ON_CARD, 1, &ok); + + int oldValue = 0; + if (scene()->selectedItems().size() == 1) { + auto *card = static_cast(scene()->selectedItems().first()); + oldValue = card->getCounters().value(counterId, 0); + } + int number = QInputDialog::getInt(nullptr, tr("Set counters"), tr("Number:"), oldValue, 0, + MAX_COUNTERS_ON_CARD, 1, &ok); dialogSemaphore = false; if (clearCardsToDelete() || !ok) { return;