diff --git a/CHANGELOG.md b/CHANGELOG.md index bfc83993..f19f7ffc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project somewhat adheres to [Semantic Versioning](https://semver.org/sp - Fix degraded image quality in exported timelapse gifs. - Fix custom top-level data in the `encounters` object of `wild_encounters.json` being discarded if no `fields` data is present. - Fix actions triggered with the use of `utility.registerAction` calling all functions across plug-ins with the registered name, rather than just the function in the script that registered it. +- Fix the tool tips for the tileset selectors always listing the same tileset size. ## [6.3.0] - 2025-12-26 ### Added diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui index 674a11d1..e4d17f35 100644 --- a/forms/mainwindow.ui +++ b/forms/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 1328 - 963 + 1014 @@ -748,7 +748,7 @@ 0 0 433 - 74 + 85 @@ -867,7 +867,7 @@ 0 0 433 - 74 + 84 @@ -971,7 +971,7 @@ 8 0 421 - 409 + 471 @@ -1077,6 +1077,18 @@ Layout + + 2 + + + 2 + + + 2 + + + 2 + @@ -1099,11 +1111,20 @@ Tilesets + + 2 + + + 2 + + + 2 + + + 2 + - - <html><head/><body><p>Primary Tileset</p><p>Defines the first 0x200 metatiles available for the map.</p></body></html> - true @@ -1111,9 +1132,6 @@ - - <html><head/><body><p>Secondary Tileset</p><p>Defines the second 0x200 metatiles available for the map.</p></body></html> - true @@ -1187,7 +1205,7 @@ 0 0 437 - 633 + 684 @@ -1407,7 +1425,7 @@ 0 0 392 - 744 + 795 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6c89faa8..52ea6720 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1442,10 +1442,19 @@ bool MainWindow::setProjectUI() { const QSignalBlocker b_PrimaryTileset(ui->comboBox_PrimaryTileset); ui->comboBox_PrimaryTileset->clear(); ui->comboBox_PrimaryTileset->addItems(project->primaryTilesetLabels); + ui->comboBox_PrimaryTileset->setToolTip(Util::toHtmlParagraph( + QString("Primary Tileset

Defines the metatiles from 0 - %1 available for the map.") + .arg(Metatile::getMetatileIdString(project->getNumMetatilesPrimary()-1)) + )); const QSignalBlocker b_SecondaryTileset(ui->comboBox_SecondaryTileset); ui->comboBox_SecondaryTileset->clear(); ui->comboBox_SecondaryTileset->addItems(project->secondaryTilesetLabels); + ui->comboBox_SecondaryTileset->setToolTip(Util::toHtmlParagraph( + QString("Secondary Tileset

Defines the metatiles from %1 - %2 available for the map.") + .arg(Metatile::getMetatileIdString(project->getNumMetatilesPrimary())) + .arg(Metatile::getMetatileIdString(project->getNumMetatilesTotal()-1)) + )); const QSignalBlocker b_LayoutSelector(ui->comboBox_LayoutSelector); ui->comboBox_LayoutSelector->clear();