diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-08-31 11:43:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 11:43:21 +0200 |
| commit | a721bca8147f4c1b0d8f401f1b15da11b5ee2ea8 (patch) | |
| tree | ee1fab1febe81f2230df182d515eb6539d1314ff | |
| parent | 68e7a19a979067f3ee0f49cffe40130900851a08 (diff) | |
| parent | b8d5ced8cdb70cb60c9db952d70a440829047fd8 (diff) | |
Merge pull request #41628 from m4gr3d/fix_textedit_movement_bug_master
Fix issue causing the textedit to move upward
| -rw-r--r-- | platform/android/java/lib/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | platform/android/java/lib/src/org/godotengine/godot/Godot.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/platform/android/java/lib/res/values/dimens.xml b/platform/android/java/lib/res/values/dimens.xml new file mode 100644 index 0000000000..9034dbbcc1 --- /dev/null +++ b/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> diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.java b/platform/android/java/lib/src/org/godotengine/godot/Godot.java index 1b55090451..524f32bf5e 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Godot.java +++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.java @@ -151,8 +151,7 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC 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); } @@ -221,7 +220,8 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC // GodotEditText layout GodotEditText editText = new GodotEditText(activity); - 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 containerLayout.addView(editText); |