asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #41364 from m4gr3d/fix_textedit_movement_bug_3_2

Browse source 
Fix issue causing the textedit to move upward
This commit is contained in:
Rémi Verschelde 2020-08-21 02:25:25 +02:00 committed by GitHub
commit 2a692f41a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/android/java/lib/res/values/dimens.xml Normal file
View file

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

6
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View file

@ -160,8 +160,7 @@ public abstract class Godot extends FragmentActivity implements SensorEventListe
private void setButtonPausedState(boolean paused) { private void setButtonPausedState(boolean paused) {
mStatePaused = paused; mStatePaused = paused;
int stringResourceID = paused ? R.string.text_button_resume : int stringResourceID = paused ? R.string.text_button_resume : R.string.text_button_pause;
R.string.text_button_pause;
mPauseButton.setText(stringResourceID); mPauseButton.setText(stringResourceID);
} }
@ -318,7 +317,8 @@ public abstract class Godot extends FragmentActivity implements SensorEventListe
// GodotEditText layout // GodotEditText layout
GodotEditText edittext = new GodotEditText(this); 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 // ...add to FrameLayout
layout.addView(edittext); layout.addView(edittext);