Deal with more hovers

src/surge-xt/gui/widgets/EffectChooser.h

@@ -73,6 +73,9 @@ struct EffectChooser : public juce::Component,
     void mouseExit(const juce::MouseEvent &event) override { isHovered = false; }
     void endHover() override
     {
+        if (stuckHover)
+            return;
+
         isHovered = false;
         repaint();
     }

src/surge-xt/gui/widgets/LFOAndStepDisplay.h

@@ -113,6 +113,9 @@ struct LFOAndStepDisplay : public juce::Component,
 
     void endHover() override
     {
+        if (stuckHover)
+            return;
+
         lfoTypeHover = -1;
         stepSeqShiftHover = -1;
         repaint();

src/surge-xt/gui/widgets/MenuForDiscreteParams.h

@@ -125,6 +125,9 @@ struct MenuForDiscreteParams : public juce::Component,
     }
     void endHover() override
     {
+        if (stuckHover)
+            return;
+
         isHovered = false;
 
         if (glyphMode)

src/surge-xt/gui/widgets/NumberField.h

@@ -101,15 +101,13 @@ struct NumberField : public juce::Component,
     bool isHover{false};
     void mouseEnter(const juce::MouseEvent &event) override
     {
-        isHover = true;
+        startHover(event.position);
         setMouseCursor(juce::MouseCursor::UpDownResizeCursor);
-        repaint();
     }
     void mouseExit(const juce::MouseEvent &event) override
     {
-        isHover = false;
+        endHover();
         setMouseCursor(juce::MouseCursor::NormalCursor);
-        repaint();
     }
     void startHover(const juce::Point<float> &p) override
     {
@@ -118,6 +116,9 @@ struct NumberField : public juce::Component,
     }
     void endHover() override
     {
+        if (stuckHover)
+            return;
+
         isHover = false;
         repaint();
     }

src/surge-xt/gui/widgets/WaveShaperSelector.h

@@ -72,6 +72,9 @@ struct WaveShaperSelector : public juce::Component,
 
     void endHover() override
     {
+        if (stuckHover)
+            return;
+
         isWaveHovered = false;
         isLabelHovered = false;
 

src/surge-xt/gui/widgets/XMLConfiguredMenus.cpp

@@ -375,8 +375,10 @@ void OscillatorMenu::mouseDown(const juce::MouseEvent &event)
 
     auto sge = firstListenerOfType<SurgeGUIEditor>();
 
+    stuckHoverOn();
     menu.showMenuAsync(sge->popupMenuOptions(this),
                        Surge::GUI::makeAsyncCallback<OscillatorMenu>(this, [](auto *that, int) {
+                           that->stuckHoverOff();
                            that->isHovered = false;
                            that->repaint();
                        }));
@@ -392,17 +394,9 @@ void OscillatorMenu::mouseWheelMove(const juce::MouseEvent &event,
         jogBy(-dir);
     }
 }
-void OscillatorMenu::mouseEnter(const juce::MouseEvent &event)
-{
-    isHovered = true;
-    repaint();
-}
+void OscillatorMenu::mouseEnter(const juce::MouseEvent &event) { startHover(event.position); }
 
-void OscillatorMenu::mouseExit(const juce::MouseEvent &event)
-{
-    isHovered = false;
-    repaint();
-}
+void OscillatorMenu::mouseExit(const juce::MouseEvent &event) { endHover(); }
 
 bool OscillatorMenu::keyPressed(const juce::KeyPress &key)
 {
@@ -518,24 +512,18 @@ void FxMenu::mouseDown(const juce::MouseEvent &event)
 
     auto sge = firstListenerOfType<SurgeGUIEditor>();
 
+    stuckHoverOn();
     menu.showMenuAsync(sge->popupMenuOptions(this),
                        Surge::GUI::makeAsyncCallback<FxMenu>(this, [](auto *that, int) {
+                           that->stuckHoverOff();
                            that->isHovered = false;
                            that->repaint();
                        }));
 }
 
-void FxMenu::mouseEnter(const juce::MouseEvent &event)
-{
-    isHovered = true;
-    repaint();
-}
+void FxMenu::mouseEnter(const juce::MouseEvent &event) { startHover(event.position); }
 
-void FxMenu::mouseExit(const juce::MouseEvent &event)
-{
-    isHovered = false;
-    repaint();
-}
+void FxMenu::mouseExit(const juce::MouseEvent &event) { endHover(); }
 
 void FxMenu::loadSnapshot(int type, TiXmlElement *e, int idx)
 {

src/surge-xt/gui/widgets/XMLConfiguredMenus.h

@@ -239,6 +239,9 @@ struct FxMenu : public juce::Component, public XMLMenuPopulator, public WidgetBa
     }
     void endHover() override
     {
+        if (stuckHover)
+            return;
+
         isHovered = false;
         repaint();
     }