From 511c6ddb038ab384f77beb1cb4266b78c5fd0fa7 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 28 Sep 2022 03:25:08 -0400 Subject: [PATCH] fix bug related to event id spinner --- src/mainwindow.cpp | 10 +++++----- src/ui/eventframes.cpp | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6ad5b79e..15313a62 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1982,9 +1982,9 @@ void MainWindow::updateSelectedObjects() { target = ui->scrollAreaWidgetContents_Objects; ui->tabWidget_EventType->setCurrentWidget(ui->tab_Objects); - this->ui->spinner_ObjectID->setValue(current->getEventIndex() + event_offs); this->ui->spinner_ObjectID->setMinimum(event_offs); this->ui->spinner_ObjectID->setMaximum(current->getMap()->events.value(eventGroup).length() + event_offs - 1); + this->ui->spinner_ObjectID->setValue(current->getEventIndex() + event_offs); break; } case Event::Group::Warp: { @@ -1992,9 +1992,9 @@ void MainWindow::updateSelectedObjects() { target = ui->scrollAreaWidgetContents_Warps; ui->tabWidget_EventType->setCurrentWidget(ui->tab_Warps); - this->ui->spinner_WarpID->setValue(current->getEventIndex() + event_offs); this->ui->spinner_WarpID->setMinimum(event_offs); this->ui->spinner_WarpID->setMaximum(current->getMap()->events.value(eventGroup).length() + event_offs - 1); + this->ui->spinner_WarpID->setValue(current->getEventIndex() + event_offs); break; } case Event::Group::Coord: { @@ -2002,9 +2002,9 @@ void MainWindow::updateSelectedObjects() { target = ui->scrollAreaWidgetContents_Triggers; ui->tabWidget_EventType->setCurrentWidget(ui->tab_Triggers); - this->ui->spinner_TriggerID->setValue(current->getEventIndex() + event_offs); this->ui->spinner_TriggerID->setMinimum(event_offs); this->ui->spinner_TriggerID->setMaximum(current->getMap()->events.value(eventGroup).length() + event_offs - 1); + this->ui->spinner_TriggerID->setValue(current->getEventIndex() + event_offs); break; } case Event::Group::Bg: { @@ -2012,9 +2012,9 @@ void MainWindow::updateSelectedObjects() { target = ui->scrollAreaWidgetContents_BGs; ui->tabWidget_EventType->setCurrentWidget(ui->tab_BGs); - this->ui->spinner_BgID->setValue(current->getEventIndex() + event_offs); this->ui->spinner_BgID->setMinimum(event_offs); this->ui->spinner_BgID->setMaximum(current->getMap()->events.value(eventGroup).length() + event_offs - 1); + this->ui->spinner_BgID->setValue(current->getEventIndex() + event_offs); break; } case Event::Group::Heal: { @@ -2022,9 +2022,9 @@ void MainWindow::updateSelectedObjects() { target = ui->scrollAreaWidgetContents_Healspots; ui->tabWidget_EventType->setCurrentWidget(ui->tab_Healspots); - this->ui->spinner_HealID->setValue(current->getEventIndex() + event_offs); this->ui->spinner_HealID->setMinimum(event_offs); this->ui->spinner_HealID->setMaximum(current->getMap()->events.value(eventGroup).length() + event_offs - 1); + this->ui->spinner_HealID->setValue(current->getEventIndex() + event_offs); break; } default: diff --git a/src/ui/eventframes.cpp b/src/ui/eventframes.cpp index 1c196ac7..86c99a65 100644 --- a/src/ui/eventframes.cpp +++ b/src/ui/eventframes.cpp @@ -133,7 +133,6 @@ void EventFrame::connectSignals() { }); connect(this->event->getPixmapItem(), &DraggablePixmapItem::yChanged, this->spinner_y, &NoScrollSpinBox::setValue); - // TODO?? this->spinner_z->disconnect(); connect(this->spinner_z, QOverload::of(&QSpinBox::valueChanged), [this](int value) { this->event->setZ(value);