Merge pull request #124 from ImJimmi/fix-mouse-interactions-again

Fix mouse interactions on buttons with nested components
ImJimmi · Nov 28, 2023 · 37ebd0a · 37ebd0a
2 parents b936734 + 7940b10
commit 37ebd0a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/jive_components/accessibility/jive_IgnoredComponent.cpp b/jive_components/accessibility/jive_IgnoredComponent.cpp
@@ -2,6 +2,11 @@
 
 namespace jive
 {
+    IgnoredComponent::IgnoredComponent()
+    {
+        setInterceptsMouseClicks(false, true);
+    }
+
     std::unique_ptr<juce::AccessibilityHandler> IgnoredComponent::createAccessibilityHandler()
     {
         return createIgnoredAccessibilityHandler(*this);

diff --git a/jive_components/accessibility/jive_IgnoredComponent.h b/jive_components/accessibility/jive_IgnoredComponent.h
@@ -4,6 +4,8 @@ namespace jive
 {
     class IgnoredComponent : public juce::Component
     {
+    public:
+        IgnoredComponent();
         std::unique_ptr<juce::AccessibilityHandler> createAccessibilityHandler() override;
     };
 } // namespace jive
diff --git a/jive_layouts/layout/gui-items/content/jive_Image.cpp b/jive_layouts/layout/gui-items/content/jive_Image.cpp
@@ -221,7 +221,6 @@ namespace jive
         idealHeight = juce::String{ calculateRequiredHeight() };
 
         component->addComponentListener(this);
-        component->setInterceptsMouseClicks(false, false);
     }
 } // namespace jive
 

diff --git a/jive_layouts/layout/gui-items/widgets/jive_Button.cpp b/jive_layouts/layout/gui-items/widgets/jive_Button.cpp
@@ -83,12 +83,10 @@ namespace jive
             triggerClick(getButton());
         };
         getButton().addListener(this);
-        getButton().addComponentListener(this);
     }
 
     Button::~Button()
     {
-        getButton().removeComponentListener(this);
         getButton().removeListener(this);
     }
 
@@ -109,15 +107,6 @@ namespace jive
         toggled = getButton().getToggleState();
         onClick.triggerWithoutSelfCallback();
     }
-
-    void Button::componentChildrenChanged(juce::Component& comp)
-    {
-        auto& button = getButton();
-        jassertquiet(&comp == &button);
-
-        for (auto* child : button.getChildren())
-            child->addMouseListener(&button, true);
-    }
 } // namespace jive
 
 namespace juce

diff --git a/jive_layouts/layout/gui-items/widgets/jive_Button.h b/jive_layouts/layout/gui-items/widgets/jive_Button.h
@@ -5,7 +5,6 @@ namespace jive
     class Button
         : public GuiItemDecorator
         , private juce::Button::Listener
-        , private juce::ComponentListener
     {
     public:
         enum class TriggerEvent
@@ -22,7 +21,6 @@ namespace jive
 
     private:
         void buttonClicked(juce::Button* button) final;
-        void componentChildrenChanged(juce::Component& component) final;
 
         void updateTriggerEvent();