Add non-const overload of sf::Event::getIf

Author: ChrisThrasher

include/SFML/Window/Event.hpp

@@ -316,6 +316,17 @@ class Event
     template <typename TEventSubtype>
     [[nodiscard]] bool is() const;
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Attempt to get specified event subtype
+    ///
+    /// \tparam `TEventSubtype` Type of the desired event subtype
+    ///
+    /// \return Address of current event subtype, otherwise `nullptr`
+    ///
+    ////////////////////////////////////////////////////////////
+    template <typename TEventSubtype>
+    [[nodiscard]] TEventSubtype* getIf();
+
     ////////////////////////////////////////////////////////////
     /// \brief Attempt to get specified event subtype
     ///

include/SFML/Window/Event.inl

@@ -58,6 +58,16 @@ bool Event::is() const
 }
 
 
+////////////////////////////////////////////////////////////
+template <typename TEventSubtype>
+TEventSubtype* Event::getIf()
+{
+    static_assert(isEventSubtype<TEventSubtype>, "TEventSubtype must be a subtype of sf::Event");
+    if constexpr (isEventSubtype<TEventSubtype>)
+        return std::get_if<TEventSubtype>(&m_data);
+}
+
+
 ////////////////////////////////////////////////////////////
 template <typename TEventSubtype>
 const TEventSubtype* Event::getIf() const

test/Window/Event.test.cpp

@@ -295,6 +295,15 @@ TEST_CASE("[Window] sf::Event")
         CHECK(sensorChanged.value == sf::Vector3f());
     }
 
+    SECTION("getIf()")
+    {
+        sf::Event event      = sf::Event::MouseMoved{{4, 2}};
+        auto*     mouseMoved = event.getIf<sf::Event::MouseMoved>();
+        REQUIRE(mouseMoved);
+        mouseMoved->position = sf::Vector2i(6, 9);
+        CHECK(mouseMoved->position == sf::Vector2i(6, 9));
+    }
+
     SECTION("visit()")
     {
         CHECK(sf::Event(sf::Event::Closed{}).visit(visitor) == "Closed");