From 348cb6ea6d26af5b34bdee521c6b5658710c159d Mon Sep 17 00:00:00 2001 From: Kamil Jarosz Date: Sat, 11 May 2024 01:09:33 +0200 Subject: [PATCH] core: Remove unnecessary SWF version check in is_focusable This check is unnecessary as is_focusable is only used in AVM1. --- core/src/display_object/movie_clip.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/core/src/display_object/movie_clip.rs b/core/src/display_object/movie_clip.rs index 3919b458d..cd68fe187 100644 --- a/core/src/display_object/movie_clip.rs +++ b/core/src/display_object/movie_clip.rs @@ -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) } }