liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Don't recreate objects when switching button states 

When switching button states, previously we cleared all children
and recreated children for the new state. Now any children that
exist in both states are persisted and not recreated.

Fixes #2354.
This commit is contained in:
Mike Welsh 2021-01-10 19:24:22 -08:00
parent 6b2b0eb2c6
commit 4e27818952
1 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
core/src/display_object/button.rs
View File

@ -117,10 +117,13 @@ impl<'gc> Button<'gc> {
/// This function instantiates children and thus must not be called whilst
/// the caller is holding a write lock on the button data.
fn set_state(
self,
mut self,
context: &mut crate::context::UpdateContext<'_, 'gc, '_>,
state: ButtonState,
) {
let mut removed_depths: fnv::FnvHashSet<_> =
self.iter_render_list().map(|o| o.depth()).collect();
let movie = self.movie().unwrap();
let mut write = self.0.write(context.gc_context);
write.state = state;
@ -129,33 +132,60 @@ impl<'gc> Button<'gc> {
ButtonState::Over => swf::ButtonState::Over,
ButtonState::Down => swf::ButtonState::Down,
};
write.container.clear(context.gc_context);
let mut new_children = Vec::new();
// Create any new children that exist in this state, and remove children
// that only exist in the previous state.
// Children that exist in both states should persist and not be recreated.
// TODO: This behavior probably differs in AVM2 (I suspect they always get recreated).
let mut children = Vec::new();
for record in &write.static_data.read().records {
if record.states.contains(&swf_state) {
if let Ok(child) = context
.library
.library_for_movie_mut(movie.clone())
.instantiate_by_id(record.id, context.gc_context)
{
child.set_parent(context.gc_context, Some(self.into()));
child.set_matrix(context.gc_context, &record.matrix);
child.set_color_transform(
context.gc_context,
&record.color_transform.clone().into(),
);
child.set_depth(context.gc_context, record.depth.into());
// State contains this depth, so we don't have to remove it.
removed_depths.remove(&record.depth.into());
new_children.push((child, record.depth));
}
let child = match write.container.get_depth(record.depth.into()) {
// Re-use existing child.
Some(child) if child.id() == record.id => child,
// Instantiate new child.
_ => {
if let Ok(child) = context
.library
.library_for_movie_mut(movie.clone())
.instantiate_by_id(record.id, context.gc_context)
{
// New child that did not previously exist, create it.
child.set_parent(context.gc_context, Some(self.into()));
child.set_depth(context.gc_context, record.depth.into());
children.push((child, record.depth));
child
} else {
continue;
}
}
};
// Set transform of child (and modify previous child if it already existed)
child.set_matrix(context.gc_context, &record.matrix);
child.set_color_transform(
context.gc_context,
&record.color_transform.clone().into(),
);
}
}
drop(write);
// Kill children that no longer exist in this state.
for depth in removed_depths {
if let Some(child) = self.child_by_depth(depth) {
self.remove_child(context, child, EnumSet::all());
}
}
drop(write);
for (child, depth) in new_children {
// Initialize child.
for (child, depth) in children {
// Initialize new child.
child.post_instantiation(context, child, None, Instantiator::Movie, false);
child.run_frame(context);
self.replace_at_depth(context, child, depth.into());