2
0
Эх сурвалжийг харах

Merge pull request #41364 from m4gr3d/fix_textedit_movement_bug_3_2

Fix issue causing the textedit to move upward
Rémi Verschelde 5 жил өмнө
parent
commit
2a692f41a3

+ 4 - 0
platform/android/java/lib/res/values/dimens.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="text_edit_height">48dp</dimen>
+</resources>

+ 3 - 3
platform/android/java/lib/src/org/godotengine/godot/Godot.java

@@ -160,8 +160,7 @@ public abstract class Godot extends FragmentActivity implements SensorEventListe
 
 	private void setButtonPausedState(boolean paused) {
 		mStatePaused = paused;
-		int stringResourceID = paused ? R.string.text_button_resume :
-										R.string.text_button_pause;
+		int stringResourceID = paused ? R.string.text_button_resume : R.string.text_button_pause;
 		mPauseButton.setText(stringResourceID);
 	}
 
@@ -318,7 +317,8 @@ public abstract class Godot extends FragmentActivity implements SensorEventListe
 
 		// GodotEditText layout
 		GodotEditText edittext = new GodotEditText(this);
-		edittext.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+		edittext.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT,
+				(int)getResources().getDimension(R.dimen.text_edit_height)));
 		// ...add to FrameLayout
 		layout.addView(edittext);