Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.2] Support mouse events on Android #42360

Merged
merged 1 commit into from
Oct 30, 2020
Merged

[3.2] Support mouse events on Android #42360

merged 1 commit into from
Oct 30, 2020

Conversation

thebestnom
Copy link
Contributor

Version of #37158 for 3.2.

@thebestnom thebestnom changed the title [WIP]Android click support 3.2 Android click support 3.2 Sep 27, 2020
@thebestnom thebestnom mentioned this pull request Sep 27, 2020
Merged
@Calinou Calinou added this to the 3.2 milestone Sep 27, 2020
@m4gr3d
Copy link
Contributor

m4gr3d commented Sep 29, 2020

@thebestnom Can you resolve this branch's conflicts with the 3.2 branch.

@thebestnom
Copy link
Contributor Author

Of course, when I'll be around a computer

@thebestnom thebestnom changed the title Android click support 3.2 [WIP]Support mouse events on Android 3.2 Oct 9, 2020
@thebestnom thebestnom force-pushed the android-click-support-3.2 branch 3 times, most recently from b5da300 to 3ec2f36 Compare October 9, 2020 14:01
@thebestnom thebestnom changed the title [WIP]Support mouse events on Android 3.2 Support mouse events on Android 3.2 Oct 9, 2020
@thebestnom
Copy link
Contributor Author

thebestnom commented Oct 9, 2020 •
edited
Loading

Ok, ready, Ill add the key modifier later in a different PR

@thebestnom thebestnom changed the title Support mouse events on Android 3.2 [3.2]Support mouse events on Android Oct 11, 2020
@thebestnom
Copy link
Contributor Author

Anything else?

@Chaosus Chaosus changed the title [3.2]Support mouse events on Android [3.2] Support mouse events on Android Oct 28, 2020
@m4gr3d
Copy link
Contributor

m4gr3d commented Oct 28, 2020

cc @pouleyKetchoupp for review.
@akien-mga Can this PR (and the master version) be included in the next beta for 3.2.4. It's critical for some of the upcoming editor porting work.

@pouleyKetchoupp
Copy link
Contributor

Ok, I'll try to test & review tomorrow.

@thebestnom
Copy link
Contributor Author

Ill just remind here that there is keyboard support fixes to cherrypick, and I would also like to add pointer capture
before the beta (also remember when testing that a lot of devices roms doesn't support right and middle click and I couldn't find a rom that support 4 and 5 buttons as is)

@m4gr3d
Copy link
Contributor

m4gr3d commented Oct 28, 2020

@pouleyKetchoupp Thanks!

@thebestnom Do you have a PR for the keyboard support fixes to cherrypick?

@thebestnom
Copy link
Contributor Author

Ill add that once this PR is merged, as it adds keyboard modifier support and the mouse input needs that to be added

pouleyKetchoupp
pouleyKetchoupp suggested changes Oct 29, 2020
View reviewed changes
platform/android/os_android.h Outdated Show resolved Hide resolved
@pouleyKetchoupp
Copy link
Contributor

Looks good apart from the method override I commented. Didn't spot anything wrong while testing.

@thebestnom
Android: Mouse Implementation
191c84f 
Implement mouse
Move touch to inputManager
Change to use android/input.h
@thebestnom
Copy link
Contributor Author

Fixed 👍

@akien-mga akien-mga merged commit 61ad669 into godotengine:3.2 Oct 30, 2020
@akien-mga
Copy link
Member

Thanks a ton for your work on this feature, and thanks @m4gr3d and @pouleyKetchoupp for the in-depth reviews and testing! Great team work here :)

@thebestnom thebestnom deleted the android-click-support-3.2 branch October 31, 2020 16:13
@aaronfranke aaronfranke mentioned this pull request Dec 17, 2020
Closed
@akien-mga akien-mga modified the milestones: 3.2, 3.3 Apr 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@m4gr3d m4gr3d m4gr3d approved these changes

@pouleyKetchoupp pouleyKetchoupp pouleyKetchoupp approved these changes

@akien-mga akien-mga akien-mga approved these changes

Assignees
No one assigned
Labels
enhancement needs testing platform:android topic:input topic:porting
Projects
None yet
Milestone
3.3
Development

Successfully merging this pull request may close these issues.
5 participants
@thebestnom @m4gr3d @pouleyKetchoupp @akien-mga @Calinou