Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't even bother checking touch.id == 0 for closing popup windows. It's fine to close with any touch.

Browse source 
Fixes issue with touch on Windows mentioned in #14387

Also includes a warning fix.
This commit is contained in:
Henrik Rydgård 2021-04-17 22:33:44 +02:00
parent 87d4833d89
commit bfee168175
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Common/UI/UIScreen.cpp
View file

@ -222,7 +222,7 @@ PopupScreen::PopupScreen(std::string title, std::string button1, std::string but
}
bool PopupScreen::touch(const TouchInput &touch) {
if (!box_ || (touch.flags & TOUCH_DOWN) == 0 || touch.id != 0) {
if (!box_ || (touch.flags & TOUCH_DOWN) == 0) {
return UIDialogScreen::touch(touch);
}

2
UI/ChatScreen.cpp
View file

@ -196,7 +196,7 @@ void ChatMenu::UpdateChat() {
}
bool ChatMenu::touch(const TouchInput &touch) {
if (!box_ || (touch.flags & TOUCH_DOWN) == 0 || touch.id != 0) {
if (!box_ || (touch.flags & TOUCH_DOWN) == 0) {
return UIDialogScreen::touch(touch);
}

1
Windows/TouchInputHandler.h
View file

@ -20,7 +20,6 @@ class TouchInputHandler
{
public:
TouchInputHandler();
~TouchInputHandler();
void handleTouchEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
void registerTouchWindow(HWND wnd);
bool hasTouch();

4
android/src/org/ppsspp/ppsspp/NativeActivity.java
View file

@ -1145,7 +1145,9 @@ public abstract class NativeActivity extends Activity {
Uri selectedFile = data.getData();
if (selectedFile != null) {
// Grab permanent permission so we can show it in recents list etc.
getContentResolver().takePersistableUriPermission(selectedFile, Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (Build.VERSION.SDK_INT >= 19) {
getContentResolver().takePersistableUriPermission(selectedFile, Intent.FLAG_GRANT_READ_URI_PERMISSION);
}
Log.i(TAG, "Browse file finished:" + selectedFile.toString());
NativeApp.sendMessage("browse_fileSelect", selectedFile.toString());
}