Skip to content

core: In MovieClip's avm1_mouse_pick, don't check for AVM2 content #23462

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

Draft
ChrisCPI wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

core: In MovieClip's avm1_mouse_pick, don't check for AVM2 content #23462

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
14 changes: 3 additions & 11 deletions core/src/display_object/movie_clip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2984,17 +2984,7 @@ impl<'gc> TInteractiveObject<'gc> for MovieClip<'gc> {
}
} else if result.is_none() {
if let Some(child) = child.as_interactive() {
result = if !child.as_displayobject().movie().is_action_script_3() {
child.mouse_pick_avm1(context, point, require_button_mode)
} else {
let avm2_result =
child.mouse_pick_avm2(context, point, require_button_mode);
if let Avm2MousePick::Hit(result) = avm2_result {
Some(result)
} else {
None
}
}
result = child.mouse_pick_avm1(context, point, require_button_mode);
} else if check_non_interactive
&& self.mouse_enabled()
&& child.hit_test_shape(context, point, options)
Expand Down Expand Up @@ -3097,6 +3087,8 @@ impl<'gc> TInteractiveObject<'gc> for MovieClip<'gc> {
if child.as_displayobject().movie().is_action_script_3() {
child.mouse_pick_avm2(context, point, require_button_mode)
} else {
// This is possible because SWF 9 allows moving
// AVM1 content outside of the parenting LoaderDisplay.
let avm1_result =
child.mouse_pick_avm1(context, point, require_button_mode);
if let Some(result) = avm1_result {
Expand Down
Loading