Skip to content

fix ChildContainer.depth_list child removal when child's depth changed #10405

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
wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −4
Open

fix ChildContainer.depth_list child removal when child's depth changed #10405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ea2d12
hacky fix to depth list item remove when child depth changed
emgfc Mar 27, 2023
0985304
remove extra brace
emgfc Mar 27, 2023
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
17 changes: 13 additions & 4 deletions core/src/display_object/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,11 +594,20 @@ impl<'gc> ChildContainer<'gc> {
/// if no list alterations were made.
fn remove_child_from_depth_list(&mut self, child: DisplayObject<'gc>) -> bool {
if let Some(other_child) = self.depth_list.get(&child.depth()) {
DisplayObject::ptr_eq(*other_child, child)
&& self.depth_list.remove(&child.depth()).is_some()
} else {
false
return DisplayObject::ptr_eq(*other_child, child)
&& self.depth_list.remove(&child.depth()).is_some();
}

// Hack to remove child from depth list by value if previous fast lookup didn't work.
if let Some((&depth, _)) = self
.depth_list
.iter()
.find(|(_, obj)| DisplayObject::ptr_eq(**obj, child))
{
return self.depth_list.remove(&depth).is_some();
}

false
}

/// Remove a child from the render list.
Expand Down