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: Remove unnecessary SWF version check in is_focusable 

This check is unnecessary as is_focusable is only used in AVM1.
This commit is contained in:
Kamil Jarosz 2024-05-11 01:09:33 +02:00 committed by Nathan Adams
parent b0eb0ef1d9
commit 348cb6ea6d
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/display_object/movie_clip.rs
View File

@ -3358,16 +3358,12 @@ impl<'gc> TInteractiveObject<'gc> for MovieClip<'gc> {
}
fn is_focusable(&self, context: &mut UpdateContext<'_, 'gc>) -> bool {
if !self.movie().is_action_script_3() {
if self.is_root() {
false
} else if self.is_button_mode(context) {
true
} else {
self.get_avm1_boolean_property(context, "focusEnabled", |_| false)
}
} else {
if self.is_root() {
false
} else if self.is_button_mode(context) {
true
} else {
self.get_avm1_boolean_property(context, "focusEnabled", |_| false)
}
}