Improve m_ctrl_pressed detection in Editor::event

SuperTux · Nov 8, 2024 · 95af078 · 95af078
1 parent 1e5d753
commit 95af078
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
@@ -858,16 +858,14 @@ Editor::event(const SDL_Event& ev)
   {
     if (ev.type == SDL_KEYDOWN)
     {
-      if (ev.key.keysym.mod & KMOD_CTRL)
+      m_ctrl_pressed = ev.key.keysym.mod & KMOD_CTRL;
+
+      if (m_ctrl_pressed)
         m_scroll_speed = 16.0f;
       else if (ev.key.keysym.mod & KMOD_RSHIFT)
         m_scroll_speed = 96.0f;
 
-      if (ev.key.keysym.sym == SDLK_LCTRL)
-      {
-        m_ctrl_pressed = true;
-      }
-      else if (ev.key.keysym.sym == SDLK_F6)
+      if (ev.key.keysym.sym == SDLK_F6)
       {
         Compositor::s_render_lighting = !Compositor::s_render_lighting;
         return;
@@ -904,11 +902,10 @@ Editor::event(const SDL_Event& ev)
     }
     else if (ev.type == SDL_KEYUP)
     {
-      if (!(ev.key.keysym.mod & KMOD_CTRL) && !(ev.key.keysym.mod & KMOD_RSHIFT))
-        m_scroll_speed = 32.0f;
+      m_ctrl_pressed = ev.key.keysym.mod & KMOD_CTRL;
 
-      if (ev.key.keysym.sym == SDLK_LCTRL)
-        m_ctrl_pressed = false;
+      if (!m_ctrl_pressed && !(ev.key.keysym.mod & KMOD_RSHIFT))
+        m_scroll_speed = 32.0f;
     }
     else if (ev.type == SDL_MOUSEMOTION)
     {