Merge pull request #9605 from german77/mouse_mapping
yuzu: Read mouse scroll
This commit is contained in:
		| @@ -76,7 +76,7 @@ void MappingFactory::RegisterButton(const MappingData& data) { | ||||
|         break; | ||||
|     case EngineInputType::Analog: | ||||
|         // Ignore mouse axis when mapping buttons | ||||
|         if (data.engine == "mouse") { | ||||
|         if (data.engine == "mouse" && data.index != 4) { | ||||
|             return; | ||||
|         } | ||||
|         new_input.Set("axis", data.index); | ||||
|   | ||||
| @@ -1466,6 +1466,12 @@ void ConfigureInputPlayer::mousePressEvent(QMouseEvent* event) { | ||||
|     input_subsystem->GetMouse()->PressButton(0, 0, 0, 0, button); | ||||
| } | ||||
|  | ||||
| void ConfigureInputPlayer::wheelEvent(QWheelEvent* event) { | ||||
|     const int x = event->angleDelta().x(); | ||||
|     const int y = event->angleDelta().y(); | ||||
|     input_subsystem->GetMouse()->MouseWheelChange(x, y); | ||||
| } | ||||
|  | ||||
| void ConfigureInputPlayer::keyPressEvent(QKeyEvent* event) { | ||||
|     if (!input_setter || !event) { | ||||
|         return; | ||||
|   | ||||
| @@ -116,6 +116,9 @@ private: | ||||
|     /// Handle mouse button press events. | ||||
|     void mousePressEvent(QMouseEvent* event) override; | ||||
|  | ||||
|     /// Handle mouse wheel move events. | ||||
|     void wheelEvent(QWheelEvent* event) override; | ||||
|  | ||||
|     /// Handle key press events. | ||||
|     void keyPressEvent(QKeyEvent* event) override; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user