Skip to content

Fix TransformMapObjects merge behavior for mixed property updates #4339

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

Open
kanishka0411 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −3
Open

Fix TransformMapObjects merge behavior for mixed property updates #4339

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
20 changes: 17 additions & 3 deletions src/tiled/transformmapobjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,26 @@ void TransformMapObjects::redo()

bool TransformMapObjects::mergeWith(const QUndoCommand *other)
{
// Don't merge when the other command affects different properties
auto o = static_cast<const TransformMapObjects*>(other);
if (mChangedProperties != o->mChangedProperties)

auto dominantType = [](MapObject::ChangedProperties p) {
if (p & MapObject::RotationProperty)
return 0;
if (p & (MapObject::SizeProperty | MapObject::ShapeProperty))
return 1;
if (p & MapObject::PositionProperty)
return 2;
return 3;
};

if (dominantType(mChangedProperties) != dominantType(o->mChangedProperties))
return false;

if (!ChangeValue<MapObject, TransformState>::mergeWith(other))
return false;

return ChangeValue<MapObject, TransformState>::mergeWith(other);
mChangedProperties |= o->mChangedProperties;
return true;
}

TransformState TransformMapObjects::getValue(const MapObject *mapObject) const
Expand Down