Fixed version list bug

Previous versions would stay highlighted as currently selected after clicking "Save"
betacraftuk · May 24, 2024 · 0087aec · 0087aec
1 parent ab0fd6c
commit 0087aec
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/ui/AboutWidget.cpp b/src/ui/AboutWidget.cpp
@@ -81,7 +81,8 @@ void AboutWidget::initAboutLayout() {
     _aboutSectionLayout->addWidget(_links, 0, 0, Qt::AlignCenter);
     _aboutSectionLayout->addWidget(new QLabel(versionString), 1, 0,
                                    Qt::AlignCenter);
-    _aboutSectionLayout->addWidget(new QLabel("© Betacraft 2018-2023"), 2, 0,
+    QString copyyear = QString("© Betacraft 2018-") + QString::number(QDate::currentDate().year());
+    _aboutSectionLayout->addWidget(new QLabel(copyyear), 2, 0,
                                    Qt::AlignCenter);
 
     _aboutSectionLayout->setAlignment(Qt::AlignTop);

diff --git a/src/ui/instances/InstanceEditVersionWidget.cpp b/src/ui/instances/InstanceEditVersionWidget.cpp
@@ -56,6 +56,7 @@ InstanceEditVersionWidget::InstanceEditVersionWidget(QWidget *parent)
                 bc_versionlist_instance =
                     (bc_versionlist *)_versionListWatcher.future().result();
                 populateVersionList();
+                setSelectedInstance();
                 _instanceVersionListFetchPending = false;
             });
 }
@@ -167,10 +168,27 @@ void InstanceEditVersionWidget::setSelectedInstance() {
 }
 
 void InstanceEditVersionWidget::setInstance(bc_instance instance) {
+    if (_version != nullptr) {
+        resetVersionBackground(_version);
+    }
+
     _version = QString(instance.version);
     setSelectedInstance();
 }
 
+void InstanceEditVersionWidget::resetVersionBackground(QString version) {
+    QStandardItemModel *model =
+        static_cast<QStandardItemModel *>(_versionsTreeView->model());
+
+    for (int i = 0; i < model->rowCount(); i++) {
+        if (model->item(i)->text().compare(version) == 0) {
+            model->item(i, 0)->setBackground(QBrush());
+            model->item(i, 1)->setBackground(QBrush());
+            break;
+        }
+    }
+}
+
 QString InstanceEditVersionWidget::getSettings() {
     QModelIndexList indexes =
         _versionsTreeView->selectionModel()->selectedIndexes();

diff --git a/src/ui/instances/InstanceEditVersionWidget.h b/src/ui/instances/InstanceEditVersionWidget.h
@@ -21,6 +21,7 @@ class InstanceEditVersionWidget : public QWidget {
     explicit InstanceEditVersionWidget(QWidget *parent = nullptr);
     QString getSettings();
     void setInstance(bc_instance instance);
+    void resetVersionBackground(QString version);
     void clean();
     void versionListInit();