From 422c8f8114a45600b4c27a2c5caec3005986ebb3 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Fri, 2 Jul 2021 11:19:53 +0100
Subject: [PATCH] Accessibility:  Disable accessibility for TooltipWindows to
 prevent them from interfering with focus

---
 .../windows/juce_TooltipWindow.cpp               | 16 +---------------
 .../juce_gui_basics/windows/juce_TooltipWindow.h |  3 ---
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp
index d2ee788e6b..671de9a787 100644
--- a/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp
+++ b/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp
@@ -32,6 +32,7 @@ TooltipWindow::TooltipWindow (Component* parentComp, int delayMs)
 {
     setAlwaysOnTop (true);
     setOpaque (true);
+    setAccessible (false);
 
     if (parentComp != nullptr)
         parentComp->addChildComponent (this);
@@ -119,12 +120,6 @@ void TooltipWindow::displayTip (Point<int> screenPos, const String& tip)
        #endif
 
         toFront (false);
-
-        if (auto* handler = getAccessibilityHandler())
-        {
-            setDescription (tip);
-            handler->grabFocus();
-        }
     }
 }
 
@@ -145,9 +140,6 @@ void TooltipWindow::hideTip()
 {
     if (! reentrant)
     {
-        if (auto* handler = getAccessibilityHandler())
-            handler->giveAwayFocus();
-
         tipShowing.clear();
         removeFromDesktop();
         setVisible (false);
@@ -225,10 +217,4 @@ void TooltipWindow::timerCallback()
     }
 }
 
-//==============================================================================
-std::unique_ptr<AccessibilityHandler> TooltipWindow::createAccessibilityHandler()
-{
-    return std::make_unique<AccessibilityHandler> (*this, AccessibilityRole::tooltip);
-}
-
 } // namespace juce
diff --git a/modules/juce_gui_basics/windows/juce_TooltipWindow.h b/modules/juce_gui_basics/windows/juce_TooltipWindow.h
index 44da051dc6..98dc32bc40 100644
--- a/modules/juce_gui_basics/windows/juce_TooltipWindow.h
+++ b/modules/juce_gui_basics/windows/juce_TooltipWindow.h
@@ -129,9 +129,6 @@ public:
     };
 
     //==============================================================================
-    /** @internal */
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
-
     /** @internal */
     float getDesktopScaleFactor() const override;