ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9871 from OatmealDome/leftrightclick 

Core: Use proper names for left, right, and middle click on Quartz ciface
This commit is contained in:
Léo Lam 2021-07-07 12:15:41 +02:00 committed by GitHub
parent 925379cb9f f6fabec644
commit 4b5dabff33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/FreeLookManager.cpp
View File

@ -142,11 +142,17 @@ void FreeLookController::LoadDefaults(const ControllerInterface& ciface)
m_fov_buttons->SetControlExpression(FieldOfViewButtons::DecreaseY, m_fov_buttons->SetControlExpression(FieldOfViewButtons::DecreaseY,
hotkey_string({"Shift", "`Axis Z-`"})); hotkey_string({"Shift", "`Axis Z-`"}));
// Left Click
#if defined HAVE_X11 && HAVE_X11 #if defined HAVE_X11 && HAVE_X11
m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp, m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp,
"if(`Click 3`,`RelativeMouse Y-` * 0.10, 0)"); "if(`Click 3`,`RelativeMouse Y-` * 0.10, 0)");
m_rotation_gyro->SetControlExpression(GyroButtons::PitchDown, m_rotation_gyro->SetControlExpression(GyroButtons::PitchDown,
"if(`Click 3`,`RelativeMouse Y+` * 0.10, 0)"); "if(`Click 3`,`RelativeMouse Y+` * 0.10, 0)");
#elif __APPLE__
m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp,
"if(`Left Click`,`RelativeMouse Y-` * 0.10, 0)");
m_rotation_gyro->SetControlExpression(GyroButtons::PitchDown,
"if(`Left Click`,`RelativeMouse Y+` * 0.10, 0)");
#else #else
m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp, m_rotation_gyro->SetControlExpression(GyroButtons::PitchUp,
"if(`Click 1`,`RelativeMouse Y-` * 0.10, 0)"); "if(`Click 1`,`RelativeMouse Y-` * 0.10, 0)");
@ -154,16 +160,30 @@ void FreeLookController::LoadDefaults(const ControllerInterface& ciface)
"if(`Click 1`,`RelativeMouse Y+` * 0.10, 0)"); "if(`Click 1`,`RelativeMouse Y+` * 0.10, 0)");
#endif #endif
// Middle Click
#ifdef __APPLE__
m_rotation_gyro->SetControlExpression(GyroButtons::RollLeft,
"if(`Middle Click`,`RelativeMouse X-` * 0.10, 0)");
m_rotation_gyro->SetControlExpression(GyroButtons::RollRight,
"if(`Middle Click`,`RelativeMouse X+` * 0.10, 0)");
#else
m_rotation_gyro->SetControlExpression(GyroButtons::RollLeft, m_rotation_gyro->SetControlExpression(GyroButtons::RollLeft,
"if(`Click 2`,`RelativeMouse X-` * 0.10, 0)"); "if(`Click 2`,`RelativeMouse X-` * 0.10, 0)");
m_rotation_gyro->SetControlExpression(GyroButtons::RollRight, m_rotation_gyro->SetControlExpression(GyroButtons::RollRight,
"if(`Click 2`,`RelativeMouse X+` * 0.10, 0)"); "if(`Click 2`,`RelativeMouse X+` * 0.10, 0)");
#endif
// Right Click
#if defined HAVE_X11 && HAVE_X11 #if defined HAVE_X11 && HAVE_X11
m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft, m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft,
"if(`Click 3`,`RelativeMouse X-` * 0.10, 0)"); "if(`Click 3`,`RelativeMouse X-` * 0.10, 0)");
m_rotation_gyro->SetControlExpression(GyroButtons::YawRight, m_rotation_gyro->SetControlExpression(GyroButtons::YawRight,
"if(`Click 3`,`RelativeMouse X+` * 0.10, 0)"); "if(`Click 3`,`RelativeMouse X+` * 0.10, 0)");
#elif __APPLE__
m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft,
"if(`Right Click`,`RelativeMouse X-` * 0.10, 0)");
m_rotation_gyro->SetControlExpression(GyroButtons::YawRight,
"if(`Right Click`,`RelativeMouse X+` * 0.10, 0)");
#else #else
m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft, m_rotation_gyro->SetControlExpression(GyroButtons::YawLeft,
"if(`Click 1`,`RelativeMouse X-` * 0.10, 0)"); "if(`Click 1`,`RelativeMouse X-` * 0.10, 0)");

9
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -613,6 +613,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
m_buttons->SetControlExpression(0, "`Click 1`"); m_buttons->SetControlExpression(0, "`Click 1`");
// B // B
m_buttons->SetControlExpression(1, "`Click 3`"); m_buttons->SetControlExpression(1, "`Click 3`");
#elif __APPLE__
// A
m_buttons->SetControlExpression(0, "`Left Click`");
// B
m_buttons->SetControlExpression(1, "`Right Click`");
#else #else
// A // A
m_buttons->SetControlExpression(0, "`Click 0`"); m_buttons->SetControlExpression(0, "`Click 0`");
@ -633,7 +638,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
// Shake // Shake
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
#ifdef __APPLE__
m_shake->SetControlExpression(i, "`Middle Click`");
#else
m_shake->SetControlExpression(i, "`Click 2`"); m_shake->SetControlExpression(i, "`Click 2`");
#endif
// Pointing (IR) // Pointing (IR)
m_ir->SetControlExpression(0, "`Cursor Y-`"); m_ir->SetControlExpression(0, "`Cursor Y-`");