From 5d7f59a19d207a836b4412eb48fdab9d613e7c87 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 28 Jul 2021 15:40:53 +0100 Subject: [PATCH] Accessibility: Fix focus transfer issue when hiding modal components --- .../accessibility/juce_AccessibilityHandler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp index 3e2cac4358..20584e8f9d 100644 --- a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp +++ b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp @@ -75,10 +75,11 @@ AccessibilityHandler::~AccessibilityHandler() //============================================================================== AccessibleState AccessibilityHandler::getCurrentState() const { - AccessibleState state; + if (component.isCurrentlyBlockedByAnotherModalComponent() + && Component::getCurrentlyModalComponent()->isVisible()) + return {}; - if (! component.isCurrentlyBlockedByAnotherModalComponent()) - state = state.withFocusable(); + auto state = AccessibleState().withFocusable(); return hasFocus (false) ? state.withFocused() : state; }