Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bump the target SDK version to 33 (Android 13)

Browse source 
(cherry picked from commit 845ca33c76)
This commit is contained in:
Fredia Huya-Kouadio 2023-03-21 18:54:04 -07:00 • committed by Yuri Sizov
parent 5f9990e25d
commit dc100cbebb
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
View file

@ -239,8 +239,8 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
return true
}
override fun onScale(detector: ScaleGestureDetector?): Boolean {
if (detector == null || !panningAndScalingEnabled || pointerCaptureInProgress) {
override fun onScale(detector: ScaleGestureDetector): Boolean {
if (!panningAndScalingEnabled || pointerCaptureInProgress) {
return false
}
GodotLib.magnify(
@ -251,15 +251,15 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi
return true
}
override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean {
if (detector == null || !panningAndScalingEnabled || pointerCaptureInProgress) {
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
if (!panningAndScalingEnabled || pointerCaptureInProgress) {
return false
}
scaleInProgress = true
return true
}
override fun onScaleEnd(detector: ScaleGestureDetector?) {
override fun onScaleEnd(detector: ScaleGestureDetector) {
scaleInProgress = false
}
}