这是indexloc提供的服务，不要输入任何密码
Skip to content

Switch away from last layer before deleting it #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2022
Merged

Switch away from last layer before deleting it #1730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions core_lib/src/managers/layermanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,11 @@ int LayerManager::currentLayerIndex()
void LayerManager::setCurrentLayer(int layerIndex)
{
Q_ASSERT(layerIndex >= 0);

Object* o = object();
if (layerIndex >= o->getLayerCount())
{
Q_ASSERT(false);
return;
}
Q_ASSERT(layerIndex < object()->getLayerCount());

// Deselect frames of previous layer.
Layer* previousLayer = object()->getLayer(editor()->currentLayerIndex());
if (previousLayer != nullptr) {
previousLayer->deselectAll();
}
Layer* previousLayer = currentLayer();
previousLayer->deselectAll();

emit currentLayerWillChange(layerIndex);

Expand All @@ -124,12 +116,9 @@ void LayerManager::setCurrentLayer(int layerIndex)
editor()->setCurrentLayerIndex(layerIndex);
emit currentLayerChanged(layerIndex);

if (object())
if (object()->getLayer(layerIndex)->type() == Layer::CAMERA)
{
if (object()->getLayer(layerIndex)->type() == Layer::CAMERA)
{
mLastCameraLayerIdx = layerIndex;
}
mLastCameraLayerIdx = layerIndex;
}
}

Expand Down Expand Up @@ -323,15 +312,15 @@ Status LayerManager::deleteLayer(int index)
if (camLayers.size() == 1)
return Status::ERROR_NEED_AT_LEAST_ONE_CAMERA_LAYER;
}

object()->deleteLayer(layer);
Q_ASSERT(object()->getLayerCount() >= 2);

// current layer is the last layer && we are deleting it
if (index == object()->getLayerCount() &&
if (index == object()->getLayerCount() - 1 &&
index == currentLayerIndex())
{
setCurrentLayer(currentLayerIndex() - 1);
}
object()->deleteLayer(layer);
if (index >= currentLayerIndex())
{
// current layer has changed, so trigger updates
Expand Down