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

Hide connection editor when switching tabs

Browse source
This commit is contained in:
Marcus Huderle 2018-03-08 21:18:00 -08:00
parent c00d83da46
commit 1e8d1d9497
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
editor.cpp
View file

@ -38,6 +38,7 @@ void Editor::redo() {
void Editor::setEditingMap() { void Editor::setEditingMap() {
current_view = map_item; current_view = map_item;
if (map_item) { if (map_item) {
displayMapConnections();
map_item->draw(); map_item->draw();
map_item->setVisible(true); map_item->setVisible(true);
map_item->setEnabled(true); map_item->setEnabled(true);
@ -49,6 +50,10 @@ void Editor::setEditingMap() {
if (objects_group) { if (objects_group) {
objects_group->setVisible(false); objects_group->setVisible(false);
} }
if (connection_item) {
connection_item->setVisible(false);
connection_item->setEnabled(false);
}
} }
void Editor::setEditingCollision() { void Editor::setEditingCollision() {
@ -63,6 +68,10 @@ void Editor::setEditingCollision() {
if (objects_group) { if (objects_group) {
objects_group->setVisible(false); objects_group->setVisible(false);
} }
if (connection_item) {
connection_item->setVisible(false);
connection_item->setEnabled(false);
}
} }
void Editor::setEditingObjects() { void Editor::setEditingObjects() {
@ -78,6 +87,10 @@ void Editor::setEditingObjects() {
if (collision_item) { if (collision_item) {
collision_item->setVisible(false); collision_item->setVisible(false);
} }
if (connection_item) {
connection_item->setVisible(false);
connection_item->setEnabled(false);
}
} }
void Editor::setEditingConnections(QString direction) { void Editor::setEditingConnections(QString direction) {
@ -85,7 +98,7 @@ void Editor::setEditingConnections(QString direction) {
if (map_item) { if (map_item) {
map_item->draw(); map_item->draw();
map_item->setVisible(true); map_item->setVisible(true);
map_item->setEnabled(true); map_item->setEnabled(false);
ui->comboBox_ConnectedMap->blockSignals(true); ui->comboBox_ConnectedMap->blockSignals(true);
ui->comboBox_ConnectedMap->clear(); ui->comboBox_ConnectedMap->clear();
ui->comboBox_ConnectedMap->addItems(*project->mapNames); ui->comboBox_ConnectedMap->addItems(*project->mapNames);
@ -304,6 +317,11 @@ DraggablePixmapItem *Editor::addMapObject(Event *event) {
} }
void Editor::displayMapConnections() { void Editor::displayMapConnections() {
for (QString key : map->connection_items.keys()) {
scene->removeItem(map->connection_items.value(key));
delete map->connection_items.value(key);
}
for (Connection *connection : map->connections) { for (Connection *connection : map->connections) {
if (connection->direction == "dive" || connection->direction == "emerge") { if (connection->direction == "dive" || connection->direction == "emerge") {
continue; continue;