Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dpad analog overlap interaction

Browse Source
This commit is contained in:
iota97 2021-09-21 10:35:39 +02:00
parent d31eddf417
commit fc7033318f
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
UI/GamepadEmu.cpp
View File

@ -97,16 +97,13 @@ void MultiTouchButton::GetContentDimensions(const UIContext &dc, float &w, float
} }
void MultiTouchButton::Touch(const TouchInput &input) { void MultiTouchButton::Touch(const TouchInput &input) {
if (analogPointerMask & (1 << input.id))
return;
GamepadView::Touch(input); GamepadView::Touch(input);
if ((input.flags & TOUCH_DOWN) && bounds_.Contains(input.x, input.y)) { if ((input.flags & TOUCH_DOWN) && bounds_.Contains(input.x, input.y)) {
pointerDownMask_ |= 1 << input.id; pointerDownMask_ |= 1 << input.id;
usedPointerMask |= 1 << input.id; usedPointerMask |= 1 << input.id;
} }
if (input.flags & TOUCH_MOVE) { if (input.flags & TOUCH_MOVE) {
if (bounds_.Contains(input.x, input.y)) if (bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id)))
pointerDownMask_ |= 1 << input.id; pointerDownMask_ |= 1 << input.id;
else else
pointerDownMask_ &= ~(1 << input.id); pointerDownMask_ &= ~(1 << input.id);
@ -156,9 +153,6 @@ void MultiTouchButton::Draw(UIContext &dc) {
} }
void BoolButton::Touch(const TouchInput &input) { void BoolButton::Touch(const TouchInput &input) {
if (analogPointerMask & (1 << input.id))
return;
bool lastDown = pointerDownMask_ != 0; bool lastDown = pointerDownMask_ != 0;
MultiTouchButton::Touch(input); MultiTouchButton::Touch(input);
bool down = pointerDownMask_ != 0; bool down = pointerDownMask_ != 0;
@ -172,9 +166,6 @@ void BoolButton::Touch(const TouchInput &input) {
} }
void PSPButton::Touch(const TouchInput &input) { void PSPButton::Touch(const TouchInput &input) {
if (analogPointerMask & (1 << input.id))
return;
bool lastDown = pointerDownMask_ != 0; bool lastDown = pointerDownMask_ != 0;
MultiTouchButton::Touch(input); MultiTouchButton::Touch(input);
bool down = pointerDownMask_ != 0; bool down = pointerDownMask_ != 0;
@ -202,9 +193,6 @@ void ComboKey::GetContentDimensions(const UIContext &dc, float &w, float &h) con
} }
void ComboKey::Touch(const TouchInput &input) { void ComboKey::Touch(const TouchInput &input) {
if (analogPointerMask & (1 << input.id))
return;
using namespace CustomKey; using namespace CustomKey;
bool lastDown = pointerDownMask_ != 0; bool lastDown = pointerDownMask_ != 0;
MultiTouchButton::Touch(input); MultiTouchButton::Touch(input);
@ -244,9 +232,6 @@ void PSPDpad::GetContentDimensions(const UIContext &dc, float &w, float &h) cons
} }
void PSPDpad::Touch(const TouchInput &input) { void PSPDpad::Touch(const TouchInput &input) {
if (analogPointerMask & (1 << input.id))
return;
GamepadView::Touch(input); GamepadView::Touch(input);
if (input.flags & TOUCH_DOWN) { if (input.flags & TOUCH_DOWN) {
@ -257,7 +242,7 @@ void PSPDpad::Touch(const TouchInput &input) {
} }
} }
if (input.flags & TOUCH_MOVE) { if (input.flags & TOUCH_MOVE) {
if (dragPointerId_ == -1 && bounds_.Contains(input.x, input.y)) { if (dragPointerId_ == -1 && bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id))) {
dragPointerId_ = input.id; dragPointerId_ = input.id;
} }
if (input.id == dragPointerId_) { if (input.id == dragPointerId_) {