More Desktop coverage

Author: kunitoki

modules/yup_gui/desktop/yup_Desktop.cpp

@@ -134,7 +134,7 @@ void Desktop::addGlobalMouseListener (MouseListener* listener)
     if (sendingMouseEvent)
         pendingMouseListeners.addIfNotAlreadyThere (listener);
     else
-        globalMouseListeners.addIfNotAlreadyThere (listener);
+        globalMouseListeners.add (listener);
 }
 
 void Desktop::removeGlobalMouseListener (MouseListener* listener)
@@ -145,67 +145,65 @@ void Desktop::removeGlobalMouseListener (MouseListener* listener)
     YUP_ASSERT_MESSAGE_MANAGER_IS_LOCKED
 
     pendingMouseListeners.removeFirstMatchingValue (listener);
-    globalMouseListeners.removeFirstMatchingValue (listener);
+    globalMouseListeners.remove (listener);
 }
 
 void Desktop::handleGlobalMouseDown (const MouseEvent& event)
 {
     {
         ScopedValueSetter setter (sendingMouseEvent, true);
-        for (auto listener : globalMouseListeners)
-            listener->mouseDown (event);
+        globalMouseListeners.call (&MouseListener::mouseDown, event);
     }
 
-    for (auto listener : globalMouseListeners)
-        globalMouseListeners.addIfNotAlreadyThere (listener);
+    addPendingMouseListeners();
 }
 
 void Desktop::handleGlobalMouseUp (const MouseEvent& event)
 {
     {
         ScopedValueSetter setter (sendingMouseEvent, true);
-        for (auto listener : globalMouseListeners)
-            listener->mouseUp (event);
+        globalMouseListeners.call (&MouseListener::mouseUp, event);
     }
 
-    for (auto listener : globalMouseListeners)
-        globalMouseListeners.addIfNotAlreadyThere (listener);
+    addPendingMouseListeners();
 }
 
 void Desktop::handleGlobalMouseMove (const MouseEvent& event)
 {
     {
         ScopedValueSetter setter (sendingMouseEvent, true);
-        for (auto listener : globalMouseListeners)
-            listener->mouseMove (event);
+        globalMouseListeners.call (&MouseListener::mouseMove, event);
     }
 
-    for (auto listener : globalMouseListeners)
-        globalMouseListeners.addIfNotAlreadyThere (listener);
+    addPendingMouseListeners();
 }
 
 void Desktop::handleGlobalMouseDrag (const MouseEvent& event)
 {
     {
         ScopedValueSetter setter (sendingMouseEvent, true);
-        for (auto listener : globalMouseListeners)
-            listener->mouseDrag (event);
+        globalMouseListeners.call (&MouseListener::mouseDrag, event);
     }
 
-    for (auto listener : globalMouseListeners)
-        globalMouseListeners.addIfNotAlreadyThere (listener);
+    addPendingMouseListeners();
 }
 
 void Desktop::handleGlobalMouseWheel (const MouseEvent& event, const MouseWheelData& wheelData)
 {
     {
         ScopedValueSetter setter (sendingMouseEvent, true);
-        for (auto listener : globalMouseListeners)
-            listener->mouseWheel (event, wheelData);
+        globalMouseListeners.call (&MouseListener::mouseWheel, event, wheelData);
     }
 
-    for (auto listener : globalMouseListeners)
-        globalMouseListeners.addIfNotAlreadyThere (listener);
+    addPendingMouseListeners();
+}
+
+void Desktop::addPendingMouseListeners()
+{
+    for (auto listener : pendingMouseListeners)
+        globalMouseListeners.add (listener);
+
+    pendingMouseListeners.clear();
 }
 
 //==============================================================================

modules/yup_gui/desktop/yup_Desktop.h

@@ -180,12 +180,14 @@ class YUP_API Desktop
     void registerNativeComponent (ComponentNative* nativeComponent);
     void unregisterNativeComponent (ComponentNative* nativeComponent);
 
+    void addPendingMouseListeners();
+
     Screen::Array screens;
     std::optional<MouseCursor> currentMouseCursor;
 
     std::unordered_map<void*, ComponentNative*> nativeComponents;
 
-    Array<MouseListener*> globalMouseListeners;
+    ListenerList<MouseListener> globalMouseListeners;
     Array<MouseListener*> pendingMouseListeners;
     bool sendingMouseEvent = false;
 

tests/yup_gui.cpp

@@ -21,6 +21,7 @@
 
 #include "yup_gui/yup_ComboBox.cpp"
 #include "yup_gui/yup_Component.cpp"
+#include "yup_gui/yup_Desktop.cpp"
 #include "yup_gui/yup_FileChooser.cpp"
 #include "yup_gui/yup_Label.cpp"
 #include "yup_gui/yup_ListBox.cpp"