Fixed font scaling issues.

raeleus · Jan 31, 2023 · ffb1832 · ffb1832
1 parent 644989e
commit ffb1832
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,5 @@
 ### Skin Composer Version 56 ###
-* 
+* Fixed font scaling issues.
 
 ### Skin Composer Version 55a ###
 * Fixed build error preventing Skin Composer from starting.

diff --git a/core/src/com/ray3k/skincomposer/dialog/DialogFonts.java b/core/src/com/ray3k/skincomposer/dialog/DialogFonts.java
@@ -643,7 +643,7 @@ private void changeSettingsDialog(final FontData font) {
             protected void result(Object object) {
                 if ((boolean) object) {
                     var scaling = Integer.parseInt(scalingField.getText());
-                    if (scaling < 1) scaling = 1;
+                    if (scaling < 1) scaling = -1;
                     changeFontSettings(font, nameField.getText(), scaling, markupCheckBox.isChecked(), flipCheckBox.isChecked());
                 }
             }
@@ -690,7 +690,7 @@ public Dialog show(Stage stage) {
         LabelStyle previewStyle = new LabelStyle();
         previewStyle.font = new BitmapFont(font.file, font.isFlip());
         final var previewCapHeight = previewStyle.font.getCapHeight();
-        previewStyle.font.getData().setScale(font.getScaling() / previewStyle.font.getCapHeight());
+        if (font.getScaling() != -1) previewStyle.font.getData().setScale(font.getScaling() / previewStyle.font.getCapHeight());
 
         dialog.getContentTable().row();
         Table table = new Table();
@@ -741,7 +741,7 @@ public void changed(ChangeListener.ChangeEvent event, Actor actor) {
             if (c == '\n') {
                 if (!okButton.isDisabled()) {
                     var scaling = Integer.parseInt(scalingField.getText());
-                    if (scaling < 1) scaling = 1;
+                    if (scaling < 1) scaling = -1;
                     changeFontSettings(font, textField1.getText(), scaling, markupCheckBox.isChecked(), flipCheckBox.isChecked());
                     dialog.hide();
                 }
@@ -1170,7 +1170,7 @@ protected void result(Object object) {
                             String name = nameField.getText();
 
                             var scaling = Integer.parseInt(scalingField.getText());
-                            if (scaling < 1) scaling = 1;
+                            if (scaling < 1) scaling = -1;
                             addFont(name, MathUtils.round(scaling), markupCheckBox.isChecked(), flipCheckBox.isChecked(), fileHandle);
                         }
                     }
@@ -1197,7 +1197,7 @@ public boolean remove() {
                         if (!button.isDisabled()) {
                             String name1 = textField1.getText();
                             var scaling = Integer.parseInt(scalingField.getText());
-                            if (scaling < 1) scaling = 1;
+                            if (scaling < 1) scaling = -1;
                             if (addFont(name1, MathUtils.round(scaling), markupCheckBox.isChecked(), flipCheckBox.isChecked(), fileHandle)) {
                                 nameDialog.hide();
                             }