- updated

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@117 b431acfa-c32f-4a4a-93f1-934dc6c82436

JuceLibraryCode/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp

@@ -558,6 +558,10 @@ bool ResizableWindow::restoreWindowStateFromString (const String& s)
     }
 
     updateLastPosIfNotFullScreen();
+
+    if (fs)
+        setBoundsConstrained (newPos);
+
     setFullScreen (fs);
 
     if (! fs)

JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.cpp

@@ -24,11 +24,11 @@
 
 TooltipWindow::TooltipWindow (Component* const parentComp, const int delayMs)
     : Component ("tooltip"),
+      lastComponentUnderMouse (nullptr),
       millisecondsBeforeTipAppears (delayMs),
-      mouseClicks (0),
-      mouseWheelMoves (0),
-      lastHideTime (0),
-      lastComponentUnderMouse (nullptr)
+      mouseClicks (0), mouseWheelMoves (0),
+      lastCompChangeTime (0), lastHideTime (0),
+      reentrant (false)
 {
     if (Desktop::getInstance().getMainMouseSource().canHover())
         startTimer (123);
@@ -76,27 +76,34 @@ void TooltipWindow::updatePosition (const String& tip, Point<int> pos, const Rec
 void TooltipWindow::displayTip (Point<int> screenPos, const String& tip)
 {
     jassert (tip.isNotEmpty());
-    if (tipShowing != tip)
-        repaint();
 
-    tipShowing = tip;
-
-    if (Component* const parent = getParentComponent())
+    if (! reentrant)
     {
-        updatePosition (tip, parent->getLocalPoint (nullptr, screenPos),
-                        parent->getLocalBounds());
-    }
-    else
-    {
-        updatePosition (tip, screenPos, Desktop::getInstance().getDisplays()
-                                            .getDisplayContaining (screenPos).userArea);
+        ScopedValueSetter<bool> setter (reentrant, true, false);
 
-        addToDesktop (ComponentPeer::windowHasDropShadow
-                        | ComponentPeer::windowIsTemporary
-                        | ComponentPeer::windowIgnoresKeyPresses);
-    }
+        if (tipShowing != tip)
+        {
+            tipShowing = tip;
+            repaint();
+        }
 
-    toFront (false);
+        if (Component* const parent = getParentComponent())
+        {
+            updatePosition (tip, parent->getLocalPoint (nullptr, screenPos),
+                            parent->getLocalBounds());
+        }
+        else
+        {
+            updatePosition (tip, screenPos, Desktop::getInstance().getDisplays()
+                                                .getDisplayContaining (screenPos).userArea);
+
+            addToDesktop (ComponentPeer::windowHasDropShadow
+                            | ComponentPeer::windowIsTemporary
+                            | ComponentPeer::windowIgnoresKeyPresses);
+        }
+
+        toFront (false);
+    }
 }
 
 String TooltipWindow::getTipFor (Component* const c)
@@ -110,14 +117,17 @@ String TooltipWindow::getTipFor (Component* const c)
                 return ttc->getTooltip();
     }
 
-    return String::empty;
+    return String();
 }
 
 void TooltipWindow::hideTip()
 {
-    tipShowing.clear();
-    removeFromDesktop();
-    setVisible (false);
+    if (! reentrant)
+    {
+        tipShowing.clear();
+        removeFromDesktop();
+        setVisible (false);
+    }
 }
 
 void TooltipWindow::timerCallback()

JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h

@@ -110,12 +110,13 @@ public:
 
 private:
     //==============================================================================
-    int millisecondsBeforeTipAppears;
     Point<float> lastMousePos;
-    int mouseClicks, mouseWheelMoves;
-    unsigned int lastCompChangeTime, lastHideTime;
     Component* lastComponentUnderMouse;
     String tipShowing, lastTipUnderMouse;
+    int millisecondsBeforeTipAppears;
+    int mouseClicks, mouseWheelMoves;
+    unsigned int lastCompChangeTime, lastHideTime;
+    bool reentrant;
 
     void paint (Graphics&) override;
     void mouseEnter (const MouseEvent&) override;

JuceLibraryCode/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp

@@ -36,7 +36,7 @@ public:
         clearSingletonInstance();
     }
 
-    juce_DeclareSingleton_SingleThreaded_Minimal (TopLevelWindowManager);
+    juce_DeclareSingleton_SingleThreaded_Minimal (TopLevelWindowManager)
 
     void checkFocusAsync()
     {