VerticalWheel was renamed in SFML 3

texus · Dec 16, 2023 · 7beac4b · 7beac4b
1 parent 7f85eb4
commit 7beac4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/Backend/Window/SFML/BackendGuiSFML.cpp b/src/Backend/Window/SFML/BackendGuiSFML.cpp
@@ -352,8 +352,13 @@ namespace tgui
             }
             case sf::Event::MouseWheelScrolled:
             {
+#if SFML_VERSION_MAJOR >= 3
+                if (eventSFML.mouseWheelScroll.wheel != sf::Mouse::Wheel::Vertical)
+                    return false; // TGUI only handles the vertical mouse wheel
+#else
                 if (eventSFML.mouseWheelScroll.wheel != sf::Mouse::Wheel::VerticalWheel)
                     return false; // TGUI only handles the vertical mouse wheel
+#endif
 
                 eventTGUI.type = Event::Type::MouseWheelScrolled;
                 eventTGUI.mouseWheel.delta = eventSFML.mouseWheelScroll.delta;

diff --git a/tests/BackendEvents.cpp b/tests/BackendEvents.cpp
@@ -291,7 +291,11 @@ TEST_CASE("[Backend events]")
             {
                 sf::Event eventSFML;
                 eventSFML.type = sf::Event::MouseWheelScrolled;
+#if SFML_VERSION_MAJOR >= 3
+                eventSFML.mouseWheelScroll.wheel = sf::Mouse::Wheel::Vertical;
+#else
                 eventSFML.mouseWheelScroll.wheel = sf::Mouse::Wheel::VerticalWheel;
+#endif
                 eventSFML.mouseWheelScroll.delta = 2;
                 eventSFML.mouseWheelScroll.x = 200;
                 eventSFML.mouseWheelScroll.y = 150;
@@ -304,7 +308,11 @@ TEST_CASE("[Backend events]")
                 REQUIRE(eventTGUI.mouseWheel.y == 150);
 
                 // We only handle vertical scrolling
+#if SFML_VERSION_MAJOR >= 3
+                eventSFML.mouseWheelScroll.wheel = sf::Mouse::Wheel::Horizontal;
+#else
                 eventSFML.mouseWheelScroll.wheel = sf::Mouse::Wheel::HorizontalWheel;
+#endif
                 REQUIRE(!backendGuiSFML->convertEvent(eventSFML, eventTGUI));
             }
 
@@ -481,7 +489,11 @@ TEST_CASE("[Backend events]")
 
                 // Scroll the mouse wheel on top of the slider and verify that its value changes
                 eventSFML.type = sf::Event::MouseWheelScrolled;
+#if SFML_VERSION_MAJOR >= 3
+                eventSFML.mouseWheelScroll.wheel = sf::Mouse::Wheel::Vertical;
+#else
                 eventSFML.mouseWheelScroll.wheel = sf::Mouse::Wheel::VerticalWheel;
+#endif
                 eventSFML.mouseWheelScroll.delta = 4;
                 eventSFML.mouseWheelScroll.x = 260;
                 eventSFML.mouseWheelScroll.y = 80;