Merge branch 'dev'

CHANGES.md

@@ -0,0 +1,133 @@
+### Skin Composer Version 24 ###
+* Updated to LibGDX 1.9.9.
+* Added setting for export with simple names per 1.9.9. See Project > Settings.
+* Allows import of 1.9.9 skins with simple names.
+* Added a parent setting to each style to support 1.9.9 cascading styles. Selectable parent options respects class inheritance.
+* Resolved issue with Create Bitmap Font dialog creating fonts with incorrect baseline values.
+* Resolved drag and drop broken after using Create Bitmap Font dialog.
+* Added drag and drop to Create Bitmap Font and Freetype Font dialogs.
+* Fixed SplitPane preview not allowing for adjustments.
+* Added indent spacing and tied missing properties to the Tree preview.
+* Prioritized nine patches over standard graphics when images of the same name are dragged into the Drawables dialog.
+* Auto zoom and recenter in Nine Patch Editor now considers width in addition to height.
+* Resolved auto patches not functioning correctly for fully opaque, single-colored images in Nine Patch Editor.
+* Added save/load settings for bitmap font and Freetype Font dialogs.
+* Added check for preview fonts upon project load.
+* Added option to change preview background color in Nine Patch Editor.
+* Added option to change preview background to bitmap font and Freetype font dialogs.
+* Improved appearance of handles in Nine Patch Editor when zoomed out.
+* Fixed crash when trying to move handles in Nine Patch Editor when no image is loaded.
+* Resolved update button disappearing when a new project is started.
+* Replacing a drawable with a new drawable no longer breaks the link with styles using the original.
+* Proper replacement of custom drawables with a standard drawable.
+* Replacing a drawable no longer deletes tinted drawables based on that file.
+* Fixed crash when viewing fonts with multiple images after importing skin on an unsaved, new project.
+* Added UI support for ISO-8859-1: Western European and ISO-8859-2: Central European.
+* Fixed characters select box value incorrectly set when editing a Freetype font.
+* Fixed "duplicate custom class" creating an extra default style.
+* Minor UI fixes.
+
+### Skin Composer Version 23 ###
+* Added 9-Patch Editor. See Project >> Drawables >> Create 9-Patch.
+* Fixed crash bug when adding a drawable after creating a custom drawable.
+* Fixed crash bug when saving a project with relative paths and a FreeType font with no custom serializer.
+
+### Skin Composer Version 22 ###
+* Added setting to check for updates. Update button appears on top right of main screen.
+* Added dialog to create Bitmap Fonts as an alternative to Hiero.
+* Fixed imported skin files having darkened transparent images.
+* Added preview bg color setting for Image Font dialog.
+* Temporary files and program settings are now saved in folder ".skincomposer" of the user's home directory.
+* Added Windows installer and file associations for ".scmp" files.
+* Improved layout and applied fixes to FreeType dialog.
+
+### Skin Composer Version 21 ###
+* Fixed blending issue causing white fonts to have dark outlines in Image Font.
+* Automatically suggest target file name in Image Font.
+* Fixed SplashScreen.
+
+### Skin Composer Version 20 ###
+* Upgraded to JDK 10
+* Added ImageFont dialog to create Bitmap Fonts from images designed in an image editing software.
+* Updated UI to use FreeType font.
+* Fixed FreeType fonts not loading correctly from SCMP file.
+* Fixed FreeType font selections in custom classes not saving with SCMP file.
+* Fixed editing FreeType fonts removes them from custom classes.
+* New executable releases are packaged by JavaPackager and JLink
+
+### Skin Composer Version 19 ###
+* Fixed locale error causing crash bug in the FreeType dialog.
+* Fixed crash with font in custom class when rendering table.
+* Fixed export not acknowledging custom class with font set to a FreeType font.
+
+### Skin Composer Version 18 ###
+* Added FreeType font option. Users can generate their own fonts or build their fonts in the editor.
+* Added option to export custom classes before or after the standard UI classes are defined.
+
+### Skin Composer Version 17 ###
+* Added a hexadecimal field to the color picker.
+* Added custom drawable button to drawables dialog. Use this to refer to your classes that inherit from Drawable specified in the new custom class dialog.
+* Fixed alpha slider being initialized with the incorrect color in color picker.
+* Fixed keyboard shortcuts being incorrectly configured on alternative keyboard layouts.
+* Fixed crash bug on Mac.
+* Fixed spinner not accepting numbers starting with a decimal point.
+* Fixed removing a custom property does not remove it from new custom styles.
+* Reordered JSON export so that custom classes can be implemented by styles.
+
+### Skin Composer Version 16 ###
+* Added Ctrl+E shortcut for export.
+* Added F5 shortcut for refreshing the texture atlas.
+* Moved refresh texture atlas option to project menu.
+* Added TiledDrawable functionality. See Project >> Drawables.
+
+### Skin Composer Version 15 ###
+* Added Export Format option to allow the user to select between Minimal, JavaScript, and JSON output types when exporting a skin JSON. See Project >> Settings.
+
+### Skin Composer Version 14 ###
+* Added "Raw Text" type for custom class properties to allow manual typing of arrays and objects in JSON format. Ex. ["banana", "strawberry", "grape"]
+* Allow import of objects and arrays in custom classes as "Raw Text" types.
+* Added a splash screen to show while Java is loading.
+* Added support for Spanish characters: ñ, ¿, ¡, á, é, í, ó, ú, ü.
+* All JSON exports are now encoded in UTF-8.
+
+### Skin Composer Version 13 ###
+* Fixed crashes in Progress Bar and Slider when changing spinner values to invalid values.
+* Added prompt for user to browse for missing files when opening a project.
+
+### Skin Composer Version 12 ###
+* Fixed font dialog not allowing import of fonts larger than 1024x1024
+* Possible fix for Mac version
+
+### Skin Composer Version 11 ###
+* Fixed unable to hide welcome screen setting
+* Enforce using "_data" folder when "Keep resources relative" is selected. Solves #20
+* Fixed alignment property of the TextField preview having no effect.
+* Fixed renaming a style selects a different style afterwards
+* Fixed wrong warnings when exporting imported skins
+
+### Skin Composer Version 10 ###
+* Added Welcome Screen with templates and sample files to load.
+* Added a warnings dialog to alert the user with what failed to load in import/export. Can be exported to text file.
+* stageBackground for Window class is now properly previewed in the preview pane.
+* Various bug fixes.
+
+### Skin Composer Version 9 ###
+* Added a pseudo preview for custom classes. Drawables, fonts, colors, etc. are laid out one after the other.
+* Solved dialog file filter issue on OSX affecting Open and Import.
+* Can import existing VisUI skins without crashing.
+* Sort selection is persistent in Drawables dialog.
+* Various bug fixes.
+
+### Skin Composer Version 8 ###
+* Added "Custom Class" option to include styles for classes not part of Scene2D.ui. Press the "plus" button next to the class select box.
+* Defaults for exported texture atlasses are now editable via a defaults.json file. See "Project >> Settings >> Open texture packer settings file".
+* File resources (Drawables and Fonts) can be kept relative to the save file. See "Project >> Settings >> Keep resources relative?".
+* Fixed errors with default paths for drawables and fonts.
+* Added tooltips to buttons as necessary.
+
+### Skin Composer Version 7 ###
+* Switched to TinyFileDialogs for all file dialogs across all platforms.
+* Updated user interface to Skin Composer UI.
+* Recent files menu option.
+* Refactored all of the interface code to allow for new features.
+* Multiple bug fixes and improvements.

README.md

@@ -5,13 +5,7 @@ This project is programmed in Java and depends on LibGDX and the LWJGL3 backend.
 ### Skin Composer ###
 
 * Use Skin Composer to create skins for scene2d.ui
-* Version 23
-
-### Changes ###
-
-* Added 9-Patch Editor. See Project >> Drawables >> Create 9-Patch.
-* Fixed crash bug when adding a drawable after creating a custom drawable.
-* Fixed crash bug when saving a project with relative paths and a FreeType font with no custom serializer.
+* Version 24
 
 ### Contact ###
 

build.gradle

@@ -12,10 +12,10 @@ allprojects {
     apply plugin: "eclipse"
     apply plugin: "idea"
 
-    version = '23'
+    version = '24'
     ext {
         appName = "SkinComposer"
-        gdxVersion = '1.9.8'
+        gdxVersion = '1.9.9-SNAPSHOT'
     }
 
     repositories {

core/src/com/ray3k/skincomposer/BrowseField.java

@@ -38,6 +38,7 @@
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Align;
 
 public class BrowseField extends Table {
     private TextButton textButton;
@@ -49,13 +50,15 @@ public BrowseField(String valueText, String labelText, BrowseFieldStyle style) {
 
         if (labelText != null && !labelText.equals("")) {
             label = new Label(labelText, style.labelStyle);
-            add(label);
+            add(label).colspan(2);
         }
 
         row();
         if (valueText == null) valueText = "";
         textButton = new TextButton(valueText, style.mainButtonStyle);
         textButton.setTouchable(Touchable.disabled);
+        textButton.getLabel().setAlignment(Align.left);
+        textButton.getLabelCell().padLeft(5).padRight(5);
         add(textButton).minWidth(35.0f).prefWidth(35.0f).growX();
 
         button = new ImageButton(style.rightButtonStyle);

core/src/com/ray3k/skincomposer/Main.java

@@ -81,7 +81,7 @@
 import com.ray3k.skincomposer.utils.Utils;
 
 public class Main extends ApplicationAdapter {
-    public final static String VERSION = "23";
+    public final static String VERSION = "24";
     public static String newVersion;
     public static final Class[] BASIC_CLASSES = {Button.class, CheckBox.class,
         ImageButton.class, ImageTextButton.class, Label.class, List.class,
@@ -111,9 +111,11 @@ public class Main extends ApplicationAdapter {
     private TooltipManager tooltipManager;
     public static FileHandle appFolder;
     private String[] args;
+    public static Main main;
 
     public Main (String[] args) {
         this.args = args;
+        main = this;
     }
 
     @Override
@@ -378,7 +380,19 @@ public static Class basicToStyleClass(Class clazz) {
                 i++;
             }
         }
-        return STYLE_CLASSES[i];
+        return i < STYLE_CLASSES.length ? STYLE_CLASSES[i] : null;
+    }
+
+    public static Class styleToBasicClass(Class clazz) {
+        int i = 0;
+        for (Class styleClass : STYLE_CLASSES) {
+            if (clazz.equals(styleClass)) {
+                break;
+            } else {
+                i++;
+            }
+        }
+        return BASIC_CLASSES[i];
     }
 
     public static void checkForUpdates(Main main) {

core/src/com/ray3k/skincomposer/MainListener.java

@@ -521,6 +521,11 @@ public void stylePropertyChanged(StyleProperty styleProperty,
             main.getUndoableManager().addUndoable(new UndoableManager.SelectBoxUndoable(root, styleProperty, (SelectBox) styleActor), true);
         }
     }
+
+    @Override
+    public void styleParentChanged(StyleData style, SelectBox<String> selectBox) {
+        main.getUndoableManager().addUndoable(new UndoableManager.ParentUndoable(root, style, selectBox), true);
+    }
 
     private void updateStyleProperties() {
         int classIndex = root.getClassSelectBox().getSelectedIndex();

core/src/com/ray3k/skincomposer/NinePatchWidget.java

@@ -65,6 +65,7 @@ public static enum GridType {
         NONE, LIGHT, DARK
     }
     private GridType gridType;
+    private static final int ZOOMED_OUT_STYLE_RANGE = 2;
 
     public NinePatchWidget(NinePatchWidgetStyle style) {
         listeners = new Array<>();
@@ -511,6 +512,8 @@ public static class NinePatchWidgetStyle {
         public Drawable black;
         public Drawable gridLight;
         public Drawable gridDark;
+        public Drawable zoomedOutPaddingHandle;
+        public Drawable zoomedOutContentHandle;
     }
 
     public static class TilePatternDrawable extends BaseDrawable {
@@ -636,7 +639,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.paddingHandleOver.draw(batch, x, y + offsetY + (widget.paddingBottom - 1) * widget.zoom, width, widget.zoom);
                     }
                 } else {
-                    style.paddingHandle.draw(batch, x, y + offsetY + (widget.paddingBottom - 1) * widget.zoom, width, widget.zoom);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.paddingHandle.draw(batch, x, y + offsetY + (widget.paddingBottom - 1) * widget.zoom, width, widget.zoom);
+                    } else {
+                        style.zoomedOutPaddingHandle.draw(batch, x, y + offsetY + (widget.paddingBottom - 1) * widget.zoom, width, widget.zoom);
+                    }
                 }
 
                 if (widget.currentHandle == HandleType.PADDING_LEFT) {
@@ -646,7 +653,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.paddingHandleOver.draw(batch, x + offsetX + (widget.paddingLeft - 1) * widget.zoom, y, widget.zoom, height);
                     }
                 } else {
-                    style.paddingHandle.draw(batch, x + offsetX + (widget.paddingLeft - 1) * widget.zoom, y, widget.zoom, height);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.paddingHandle.draw(batch, x + offsetX + (widget.paddingLeft - 1) * widget.zoom, y, widget.zoom, height);
+                    } else {
+                        style.zoomedOutPaddingHandle.draw(batch, x + offsetX + (widget.paddingLeft - 1) * widget.zoom, y, widget.zoom, height);
+                    }
                 }
 
                 if (widget.currentHandle == HandleType.PADDING_TOP) {
@@ -656,7 +667,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.paddingHandleOver.draw(batch, x, y + offsetY + (widget.regionHeight - widget.paddingTop) * widget.zoom, width, widget.zoom);
                     }
                 } else {
-                    style.paddingHandle.draw(batch, x, y + offsetY + (widget.regionHeight - widget.paddingTop) * widget.zoom, width, widget.zoom);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.paddingHandle.draw(batch, x, y + offsetY + (widget.regionHeight - widget.paddingTop) * widget.zoom, width, widget.zoom);
+                    } else {
+                        style.zoomedOutPaddingHandle.draw(batch, x, y + offsetY + (widget.regionHeight - widget.paddingTop) * widget.zoom, width, widget.zoom);
+                    }
                 }
 
                 if (widget.currentHandle == HandleType.PADDING_RIGHT) {
@@ -666,7 +681,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.paddingHandleOver.draw(batch, x + offsetX + (widget.regionWidth - widget.paddingRight) * widget.zoom, y, widget.zoom, height);
                     }
                 } else {
-                    style.paddingHandle.draw(batch, x + offsetX + (widget.regionWidth - widget.paddingRight) * widget.zoom, y, widget.zoom, height);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.paddingHandle.draw(batch, x + offsetX + (widget.regionWidth - widget.paddingRight) * widget.zoom, y, widget.zoom, height);
+                    } else {
+                        style.zoomedOutPaddingHandle.draw(batch, x + offsetX + (widget.regionWidth - widget.paddingRight) * widget.zoom, y, widget.zoom, height);
+                    }
                 }
             } else {
                 if (widget.currentHandle == HandleType.CONTENT_BOTTOM) {
@@ -676,7 +695,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.contentHandleOver.draw(batch, x, y + offsetY + (widget.contentBottom - 1) * widget.zoom, width, widget.zoom);
                     }
                 } else {
-                    style.contentHandle.draw(batch, x, y + offsetY + (widget.contentBottom - 1) * widget.zoom, width, widget.zoom);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.contentHandle.draw(batch, x, y + offsetY + (widget.contentBottom - 1) * widget.zoom, width, widget.zoom);
+                    } else {
+                        style.zoomedOutContentHandle.draw(batch, x, y + offsetY + (widget.contentBottom - 1) * widget.zoom, width, widget.zoom);
+                    }
                 }
 
                 if (widget.currentHandle == HandleType.CONTENT_LEFT) {
@@ -686,7 +709,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.contentHandleOver.draw(batch, x + offsetX + (widget.contentLeft - 1) * widget.zoom, y, widget.zoom, height);
                     }
                 } else {
-                    style.contentHandle.draw(batch, x + offsetX + (widget.contentLeft - 1) * widget.zoom, y, widget.zoom, height);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.contentHandle.draw(batch, x + offsetX + (widget.contentLeft - 1) * widget.zoom, y, widget.zoom, height);
+                    } else {
+                        style.zoomedOutContentHandle.draw(batch, x + offsetX + (widget.contentLeft - 1) * widget.zoom, y, widget.zoom, height);
+                    }
                 }
 
                 if (widget.currentHandle == HandleType.CONTENT_TOP) {
@@ -696,7 +723,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.contentHandleOver.draw(batch, x, y + offsetY + (widget.regionHeight - widget.contentTop) * widget.zoom, width, widget.zoom);
                     }
                 } else {
-                    style.contentHandle.draw(batch, x, y + offsetY + (widget.regionHeight - widget.contentTop) * widget.zoom, width, widget.zoom);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.contentHandle.draw(batch, x, y + offsetY + (widget.regionHeight - widget.contentTop) * widget.zoom, width, widget.zoom);
+                    } else {
+                        style.zoomedOutContentHandle.draw(batch, x, y + offsetY + (widget.regionHeight - widget.contentTop) * widget.zoom, width, widget.zoom);
+                    }
                 }
 
                 if (widget.currentHandle == HandleType.CONTENT_RIGHT) {
@@ -706,7 +737,11 @@ private void drawHandles(Batch batch, float x, float y, float width, float heigh
                         style.contentHandleOver.draw(batch, x + offsetX + (widget.regionWidth - widget.contentRight) * widget.zoom, y, widget.zoom, height);
                     }
                 } else {
-                    style.contentHandle.draw(batch, x + offsetX + (widget.regionWidth - widget.contentRight) * widget.zoom, y, widget.zoom, height);
+                    if (widget.zoom > ZOOMED_OUT_STYLE_RANGE) {
+                        style.contentHandle.draw(batch, x + offsetX + (widget.regionWidth - widget.contentRight) * widget.zoom, y, widget.zoom, height);
+                    } else {
+                        style.zoomedOutContentHandle.draw(batch, x + offsetX + (widget.regionWidth - widget.contentRight) * widget.zoom, y, widget.zoom, height);
+                    }
                 }
             }
         }