diff --git a/include/ui/noscrollcombobox.h b/include/ui/noscrollcombobox.h index 87a4f55f..1291c7e9 100644 --- a/include/ui/noscrollcombobox.h +++ b/include/ui/noscrollcombobox.h @@ -10,7 +10,6 @@ class NoScrollComboBox : public QComboBox public: explicit NoScrollComboBox(QWidget *parent = nullptr); void wheelEvent(QWheelEvent *event); - void hideArrow(); private: }; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8d44952b..e9257f2b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1429,7 +1429,6 @@ void MainWindow::updateSelectedObjects() { combo->addItems(*editor->project->mapNames); combo->setToolTip("The destination map name of the warp."); } else if (key == "destination_warp") { - combo->hideArrow(); combo->setToolTip("The warp id on the destination map."); } else if (key == "item") { if (!editor->project->itemNames->contains(value)) { @@ -1453,7 +1452,6 @@ void MainWindow::updateSelectedObjects() { combo->setToolTip("The variable by which the script is triggered.\n" "The script is triggered when this variable's value matches 'Var Value'."); } else if (key == "script_var_value") { - combo->hideArrow(); combo->setToolTip("The variable's value which triggers the script."); } else if (key == "movement_type") { if (!editor->project->movementTypes->contains(value)) { @@ -1489,20 +1487,16 @@ void MainWindow::updateSelectedObjects() { combo->setToolTip("The direction which the player must be facing\n" "to be able to interact with this event."); } else if (key == "radius_x") { - combo->hideArrow(); combo->setToolTip("The maximum number of metatiles this object\n" "is allowed to move left or right during its\n" "normal movement behavior actions."); } else if (key == "radius_y") { - combo->hideArrow(); combo->setToolTip("The maximum number of metatiles this object\n" "is allowed to move up or down during its\n" "normal movement behavior actions."); } else if (key == "script_label") { - combo->hideArrow(); combo->setToolTip("The script which is executed with this event."); } else if (key == "sight_radius_tree_id") { - combo->hideArrow(); combo->setToolTip("The maximum sight range of a trainer,\n" "OR the unique id of the berry tree."); } else { diff --git a/src/ui/noscrollcombobox.cpp b/src/ui/noscrollcombobox.cpp index d5490c21..723289d9 100644 --- a/src/ui/noscrollcombobox.cpp +++ b/src/ui/noscrollcombobox.cpp @@ -13,9 +13,3 @@ void NoScrollComboBox::wheelEvent(QWheelEvent *event) if (hasFocus()) QComboBox::wheelEvent(event); } - -void NoScrollComboBox::hideArrow() -{ - this->setStyleSheet("QComboBox {border: 0 black;}" - "QComboBox::drop-down {border: 0px;}"); -} diff --git a/src/ui/regionmapeditor.cpp b/src/ui/regionmapeditor.cpp index ba33921b..4fed9b51 100644 --- a/src/ui/regionmapeditor.cpp +++ b/src/ui/regionmapeditor.cpp @@ -86,6 +86,7 @@ void RegionMapEditor::displayRegionMap() { displayRegionMapLayoutOptions(); displayRegionMapEntriesImage(); displayRegionMapEntryOptions(); + this->hasUnsavedChanges = false; } void RegionMapEditor::displayRegionMapImage() { @@ -497,7 +498,7 @@ void RegionMapEditor::on_tabWidget_Region_Map_currentChanged(int index) { void RegionMapEditor::on_comboBox_RM_ConnectedMap_activated(const QString &mapsec) { this->ui->lineEdit_RM_MapName->setText(this->project->mapSecToMapHoverName->value(mapsec)); - this->hasUnsavedChanges = true;// sometimes this is called for unknown reasons + //this->hasUnsavedChanges = true;// sometimes this is called for unknown reasons } void RegionMapEditor::on_comboBox_RM_Entry_MapSection_activated(const QString &text) { @@ -684,7 +685,7 @@ void RegionMapEditor::resize(int w, int h) { void RegionMapEditor::on_action_Swap_triggered() { QDialog popup(this, Qt::WindowTitleHint | Qt::WindowCloseButtonHint); - popup.setWindowTitle("New City Map"); + popup.setWindowTitle("Swap Map Sections"); popup.setWindowModality(Qt::NonModal); QFormLayout form(&popup);