Browse Source

Merge pull request #9605 from german77/mouse_mapping

yuzu: Read mouse scroll
nce_cpp
bunnei 3 years ago
committed by GitHub
parent
commit
c45b1d8723
  1. 2
      src/input_common/input_mapping.cpp
  2. 6
      src/yuzu/configuration/configure_input_player.cpp
  3. 3
      src/yuzu/configuration/configure_input_player.h

2
src/input_common/input_mapping.cpp

@ -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);

6
src/yuzu/configuration/configure_input_player.cpp

@ -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;

3
src/yuzu/configuration/configure_input_player.h

@ -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;

Loading…
Cancel
Save