DragAndDropContainer: Manage keyboard focus for the drag image when t…

…he target needs it hidden

The previous implementation would trigger assertions in
grabKeyboardFocus() when the DragImageComponent was hidden due to the
target returning false from shouldDrawDragImageWhenOver().

Hiding the image would also mean that its keyboard focus was lost. Now
focus is restored when the image becomes visible again.

modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp

@@ -138,6 +138,8 @@ class DragAndDropContainer::DragImageComponent  : public Component,
 
         setVisible (newTarget == nullptr || newTarget->shouldDrawDragImageWhenOver());
 
+        maintainKeyboardFocusWhenPossible();
+
         if (newTargetComp != currentlyOverComp)
         {
             if (auto* lastTarget = getCurrentlyOver())
@@ -233,6 +235,16 @@ class DragAndDropContainer::DragImageComponent  : public Component,
     Time lastTimeOverTarget;
     int originalInputSourceIndex;
     MouseInputSource::InputSourceType originalInputSourceType;
+    bool canHaveKeyboardFocus = false;
+
+    void maintainKeyboardFocusWhenPossible()
+    {
+        const auto newCanHaveKeyboardFocus = isVisible();
+
+        if (std::exchange (canHaveKeyboardFocus, newCanHaveKeyboardFocus) != newCanHaveKeyboardFocus)
+            if (canHaveKeyboardFocus)
+                grabKeyboardFocus();
+    }
 
     void updateSize()
     {
@@ -489,7 +501,6 @@ void DragAndDropContainer::startDragging (const var& sourceDescription,
 
     dragImageComponent->sourceDetails.localPosition = sourceComponent->getLocalPoint (nullptr, lastMouseDown);
     dragImageComponent->updateLocation (false, lastMouseDown);
-    dragImageComponent->grabKeyboardFocus();
 
    #if JUCE_WINDOWS
     // Under heavy load, the layered window's paint callback can often be lost by the OS,