atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix map sort order regression

Browse source
This commit is contained in:
GriffinR 2024-08-20 23:53:55 -04:00
parent 403bade407
commit 2f24d45ca4
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mainwindow.h
View file

@ -339,9 +339,6 @@ private:
bool isProgrammaticEventTabChange; bool isProgrammaticEventTabChange;
bool projectHasUnsavedChanges; bool projectHasUnsavedChanges;
bool newMapDefaultsSet = false; bool newMapDefaultsSet = false;
MapSortOrder mapSortOrder;
bool tilesetNeedsRedraw = false; bool tilesetNeedsRedraw = false;
bool setMap(QString, bool scrollTreeView = false); bool setMap(QString, bool scrollTreeView = false);

7
src/mainwindow.cpp
View file

@ -390,7 +390,7 @@ void MainWindow::initMapSortOrder() {
connect(mapSortOrderActionGroup, &QActionGroup::triggered, this, &MainWindow::mapSortOrder_changed); connect(mapSortOrderActionGroup, &QActionGroup::triggered, this, &MainWindow::mapSortOrder_changed);
QAction* sortOrder = ui->toolButton_MapSortOrder->menu()->actions()[mapSortOrder]; QAction* sortOrder = ui->toolButton_MapSortOrder->menu()->actions()[porymapConfig.mapSortOrder];
ui->toolButton_MapSortOrder->setIcon(sortOrder->icon()); ui->toolButton_MapSortOrder->setIcon(sortOrder->icon());
sortOrder->setChecked(true); sortOrder->setChecked(true);
} }
@ -424,7 +424,7 @@ void MainWindow::mapSortOrder_changed(QAction *action)
} }
} }
if (i != mapSortOrder) if (i != porymapConfig.mapSortOrder)
{ {
ui->toolButton_MapSortOrder->setIcon(action->icon()); ui->toolButton_MapSortOrder->setIcon(action->icon());
porymapConfig.mapSortOrder = static_cast<MapSortOrder>(i); porymapConfig.mapSortOrder = static_cast<MapSortOrder>(i);
@ -462,7 +462,6 @@ void MainWindow::loadUserSettings() {
this->editor->settings->cursorTileRectEnabled = porymapConfig.showCursorTile; this->editor->settings->cursorTileRectEnabled = porymapConfig.showCursorTile;
ui->checkBox_ToggleBorder->setChecked(porymapConfig.showBorder); ui->checkBox_ToggleBorder->setChecked(porymapConfig.showBorder);
ui->checkBox_ToggleGrid->setChecked(porymapConfig.showGrid); ui->checkBox_ToggleGrid->setChecked(porymapConfig.showGrid);
mapSortOrder = porymapConfig.mapSortOrder;
ui->horizontalSlider_CollisionTransparency->blockSignals(true); ui->horizontalSlider_CollisionTransparency->blockSignals(true);
this->editor->collisionOpacity = static_cast<qreal>(porymapConfig.collisionOpacity) / 100; this->editor->collisionOpacity = static_cast<qreal>(porymapConfig.collisionOpacity) / 100;
ui->horizontalSlider_CollisionTransparency->setValue(porymapConfig.collisionOpacity); ui->horizontalSlider_CollisionTransparency->setValue(porymapConfig.collisionOpacity);
@ -1092,7 +1091,7 @@ void MainWindow::sortMapList() {
mapGroupItemsList->clear(); mapGroupItemsList->clear();
QStandardItem *root = mapListModel->invisibleRootItem(); QStandardItem *root = mapListModel->invisibleRootItem();
switch (mapSortOrder) switch (porymapConfig.mapSortOrder)
{ {
case MapSortOrder::Group: case MapSortOrder::Group:
for (int i = 0; i < project->groupNames.length(); i++) { for (int i = 0; i < project->groupNames.length(); i++) {