LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.4: fixed a camera zoom error with text input

Browse Source
This commit is contained in:
Evan Debenham 2021-07-29 13:20:49 -04:00
parent d03c80cb97
commit 87186c1426
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SPD-classes/src/main/java/com/watabou/noosa/TextInput.java
View File

@ -33,7 +33,7 @@ public class TextInput extends Component {
private NinePatch bg; private NinePatch bg;
public TextInput( NinePatch bg, boolean multiline ){ public TextInput( NinePatch bg, boolean multiline, int size ){
super(); super();
this.bg = bg; this.bg = bg;
add(bg); add(bg);
@ -52,10 +52,8 @@ public class TextInput extends Component {
skin = new Skin(FileUtils.getFileHandle(Files.FileType.Internal, "gdx/textfield.json")); skin = new Skin(FileUtils.getFileHandle(Files.FileType.Internal, "gdx/textfield.json"));
int zoom = (int) Camera.main.zoom;
int textSize = multiline ? 6 : 9;
TextField.TextFieldStyle style = skin.get(TextField.TextFieldStyle.class); TextField.TextFieldStyle style = skin.get(TextField.TextFieldStyle.class);
style.font = Game.platform.getFont(textSize*zoom, "", false, false); style.font = Game.platform.getFont(size, "", false, false);
style.background = null; style.background = null;
textField = multiline ? new TextArea("", style) : new TextField("", style); textField = multiline ? new TextArea("", style) : new TextField("", style);
textField.setProgrammaticChangeEvents(true); textField.setProgrammaticChangeEvents(true);
@ -65,7 +63,7 @@ public class TextInput extends Component {
textField.addListener(new ChangeListener() { textField.addListener(new ChangeListener() {
@Override @Override
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {
BitmapFont f = Game.platform.getFont(textSize*zoom, textField.getText(), false, false); BitmapFont f = Game.platform.getFont(size, textField.getText(), false, false);
TextField.TextFieldStyle style = textField.getStyle(); TextField.TextFieldStyle style = textField.getStyle();
if (f != style.font){ if (f != style.font){
style.font = f; style.font = f;

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/WndTextInput.java
View File

@ -38,7 +38,8 @@ public class WndTextInput extends Window {
txtTitle.setPos((width - txtTitle.width()) / 2, 2); txtTitle.setPos((width - txtTitle.width()) / 2, 2);
add(txtTitle); add(txtTitle);
TextInput textBox = new TextInput(Chrome.get(Chrome.Type.TOAST_WHITE), multiLine); int textSize = (int)PixelScene.uiCamera.zoom * (multiLine ? 6 : 9);
TextInput textBox = new TextInput(Chrome.get(Chrome.Type.TOAST_WHITE), multiLine, textSize);
if (initialValue != null) textBox.setText(initialValue); if (initialValue != null) textBox.setText(initialValue);
textBox.setMaxLength(maxLength); textBox.setMaxLength(maxLength);