Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-30 11:56:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix hardcoded tileset size in tool tip, adjust margins

Browse Source
This commit is contained in:
GriffinR
2026-02-02 13:18:36 -05:00
parent 06cc7d6b59
commit 37882368e0
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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

42
forms/mainwindow.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1328</width>
<height>963</height>
<height>1014</height>
</rect>
</property>
<property name="windowTitle">
@@ -748,7 +748,7 @@
<x>0</x>
<y>0</y>
<width>433</width>
<height>74</height>
<height>85</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_12">
@@ -867,7 +867,7 @@
<x>0</x>
<y>0</y>
<width>433</width>
<height>74</height>
<height>84</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
@@ -971,7 +971,7 @@
<x>8</x>
<y>0</y>
<width>421</width>
<height>409</height>
<height>471</height>
</rect>
</property>
<property name="sizePolicy">
@@ -1077,6 +1077,18 @@
<string>Layout</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="NoScrollComboBox" name="comboBox_LayoutSelector">
<property name="editable">
@@ -1099,11 +1111,20 @@
<string>Tilesets</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="NoScrollComboBox" name="comboBox_PrimaryTileset">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Primary Tileset&lt;/p&gt;&lt;p&gt;Defines the first 0x200 metatiles available for the map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
@@ -1111,9 +1132,6 @@
</item>
<item>
<widget class="NoScrollComboBox" name="comboBox_SecondaryTileset">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Secondary Tileset&lt;/p&gt;&lt;p&gt;Defines the second 0x200 metatiles available for the map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
@@ -1187,7 +1205,7 @@
<x>0</x>
<y>0</y>
<width>437</width>
<height>633</height>
<height>684</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_7">
@@ -1407,7 +1425,7 @@
<x>0</x>
<y>0</y>
<width>392</width>
<height>744</height>
<height>795</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">

9
src/mainwindow.cpp
View File

@@ -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("<b>Primary Tileset</b><br><br>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("<b>Secondary Tileset</b><br><br>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();