Merge branch 'libgdx:master' into tp

libgdx · Aug 26, 2021 · 65ad549 · 65ad549
2 parents 1e2050d + 358153b
commit 65ad549
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/extensions/gdx-box2d/gdx-box2d/src/com/badlogic/gdx/physics/box2d/World.java b/extensions/gdx-box2d/gdx-box2d/src/com/badlogic/gdx/physics/box2d/World.java
@@ -327,7 +327,8 @@ public void destroyBody (Body body) {
 		Array<Fixture> fixtureList = body.getFixtureList();
 		while(fixtureList.size > 0) {
 			Fixture fixtureToDelete = fixtureList.removeIndex(0);
- 			this.fixtures.remove(fixtureToDelete.addr).setUserData(null);
+			fixtureToDelete.setUserData(null);
+ 			this.fixtures.remove(fixtureToDelete.addr);
  			freeFixtures.free(fixtureToDelete);
  		}
 

diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/TextField.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/TextField.java
@@ -238,6 +238,7 @@ protected void calculateOffsets () {
 		float[] glyphPositions = this.glyphPositions.items;
 
 		// Check if the cursor has gone out the left or right side of the visible area and adjust renderOffset.
+		cursor = MathUtils.clamp(cursor, 0, glyphCount - 1);
 		float distance = glyphPositions[Math.max(0, cursor - 1)] + renderOffset;
 		if (distance <= 0)
 			renderOffset -= distance;