yuzu/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2024-12-30 19:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6659 from german77/mouse_panning

Browse source 
input_common: Fix mouse panning behaivour
This commit is contained in:
Ameer J 2021-07-17 16:32:43 -04:00 committed by GitHub
parent 046de2cc4e 14d5202da6
commit c42c3561b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/settings.h
View file

@ -368,7 +368,7 @@ struct Values {
"udp_input_servers"}; "udp_input_servers"};
BasicSetting<bool> mouse_panning{false, "mouse_panning"}; BasicSetting<bool> mouse_panning{false, "mouse_panning"};
BasicSetting<u8> mouse_panning_sensitivity{1, "mouse_panning_sensitivity"}; BasicSetting<u8> mouse_panning_sensitivity{10, "mouse_panning_sensitivity"};
BasicSetting<bool> mouse_enabled{false, "mouse_enabled"}; BasicSetting<bool> mouse_enabled{false, "mouse_enabled"};
std::string mouse_device; std::string mouse_device;
MouseButtonsRaw mouse_buttons; MouseButtonsRaw mouse_buttons;

2
src/input_common/mouse/mouse_poller.cpp
View file

@ -84,7 +84,7 @@ public:
std::lock_guard lock{mutex}; std::lock_guard lock{mutex};
const auto axis_value = const auto axis_value =
static_cast<float>(mouse_input->GetMouseState(button).axis.at(axis)); static_cast<float>(mouse_input->GetMouseState(button).axis.at(axis));
const float sensitivity = Settings::values.mouse_panning_sensitivity.GetValue() * 0.15f; const float sensitivity = Settings::values.mouse_panning_sensitivity.GetValue() * 0.10f;
return axis_value * sensitivity / (100.0f * range); return axis_value * sensitivity / (100.0f * range);
} }

9
src/yuzu/bootmanager.cpp
View file

@ -411,8 +411,9 @@ void GRenderWindow::mousePressEvent(QMouseEvent* event) {
if (event->source() == Qt::MouseEventSynthesizedBySystem) { if (event->source() == Qt::MouseEventSynthesizedBySystem) {
return; return;
} }
// Qt sometimes returns the parent coordinates. To avoid this we read the global mouse
auto pos = event->pos(); // coordinates and map them to the current render area
const auto pos = mapFromGlobal(QCursor::pos());
const auto [x, y] = ScaleTouch(pos); const auto [x, y] = ScaleTouch(pos);
const auto button = QtButtonToMouseButton(event->button()); const auto button = QtButtonToMouseButton(event->button());
input_subsystem->GetMouse()->PressButton(x, y, button); input_subsystem->GetMouse()->PressButton(x, y, button);
@ -429,7 +430,9 @@ void GRenderWindow::mouseMoveEvent(QMouseEvent* event) {
if (event->source() == Qt::MouseEventSynthesizedBySystem) { if (event->source() == Qt::MouseEventSynthesizedBySystem) {
return; return;
} }
auto pos = event->pos(); // Qt sometimes returns the parent coordinates. To avoid this we read the global mouse
// coordinates and map them to the current render area
const auto pos = mapFromGlobal(QCursor::pos());
const auto [x, y] = ScaleTouch(pos); const auto [x, y] = ScaleTouch(pos);
const int center_x = width() / 2; const int center_x = width() / 2;
const int center_y = height() / 2; const int center_y = height() / 2;