move toKeyEvent implementation into touchcontrols

y5nw · Dec 31, 2024 · c5a0215 · c5a0215
1 parent 67dd5dc
commit c5a0215
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/client/keycode.h b/src/client/keycode.h
@@ -38,14 +38,6 @@ class KeyPress
 		return 0;
 	}
 
-	irr::SEvent toKeyEvent(bool pressedDown = false) const
-	{
-		irr::SEvent event;
-		event.EventType = EET_KEY_INPUT_EVENT;
-		event.KeyInput = {getKeychar(), getKeycode(), getScancode(), pressedDown, false, false};
-		return event;
-	}
-
 	bool operator==(const KeyPress &o) const
 	{
 #if USE_SDL2

diff --git a/src/gui/touchcontrols.cpp b/src/gui/touchcontrols.cpp
@@ -30,7 +30,15 @@ TouchControls *g_touchcontrols;
 
 void TouchControls::emitKeyboardEvent(const KeyPress &key, bool pressed)
 {
-	m_receiver->OnEvent(key.toKeyEvent(pressed));
+	SEvent e{};
+	e.EventType              = EET_KEY_INPUT_EVENT;
+	e.KeyInput.Key           = key.getKeycode();
+	e.KeyInput.Control       = false;
+	e.KeyInput.Shift         = false;
+	e.KeyInput.Char          = key.getKeychar();
+	e.KeyInput.SystemKeyCode = key.getScancode();
+	e.KeyInput.PressedDown   = pressed;
+	m_receiver->OnEvent(e);
 }
 
 void TouchControls::loadButtonTexture(IGUIImage *gui_button, const std::string &path)