diff --git a/assets/style/uiskin.json b/assets/style/uiskin.json index 72f00a02..8df755cd 100644 --- a/assets/style/uiskin.json +++ b/assets/style/uiskin.json @@ -215,18 +215,6 @@ knobBefore: progressbar-filled-vertical } }, - com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: { - default-horizontal: { - background: slider, - knob: slider-knob, - disabledKnob: slider-knob-disabled - }, - default-vertical: { - background: slider-vertical, - knob: slider-knob, - disabledKnob: slider-knob-disabled - } - }, com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: { default: { font: default-font, diff --git a/hyperlap2d-common-api b/hyperlap2d-common-api index 98f3d35b..8d92d919 160000 --- a/hyperlap2d-common-api +++ b/hyperlap2d-common-api @@ -1 +1 @@ -Subproject commit 98f3d35b17b66d9959a3ebf88c0986de50a1a9a2 +Subproject commit 8d92d919a4c3f99b3e1d2bce7955fc3c8e1c2022 diff --git a/src/main/java/games/rednblack/editor/controller/commands/ItemChildrenTransformCommand.java b/src/main/java/games/rednblack/editor/controller/commands/ItemChildrenTransformCommand.java index 5e5f369a..dbe89804 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/ItemChildrenTransformCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/ItemChildrenTransformCommand.java @@ -113,7 +113,7 @@ public class ItemChildrenTransformCommand extends EntityModifyRevertibleCommand } } - private class PositionSize { + private static class PositionSize { Vector2 position; Vector2 size; diff --git a/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java b/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java index e0d42c9f..ec2ad35e 100644 --- a/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java +++ b/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java @@ -22,7 +22,7 @@ public class EntityClickListener implements InputListener { private int button; private boolean pressed, over, cancelled; private long visualPressedTime; - private long tapCountInterval = (long)(0.4f * 1000000000l); + private long tapCountInterval = (long)(0.4f * 1000000000L); private int tapCount; private long lastTapTime; @@ -153,7 +153,7 @@ public class EntityClickListener implements InputListener { /** @param tapCountInterval time in seconds that must pass for two touch down/up sequences to be detected as consecutive taps. */ public void setTapCountInterval (float tapCountInterval) { - this.tapCountInterval = (long)(tapCountInterval * 1000000000l); + this.tapCountInterval = (long)(tapCountInterval * 1000000000L); } /** Returns the number of taps within the tap count interval for the most recent click event. */ diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java index c33bf3d9..ec1e3116 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java @@ -96,7 +96,7 @@ public class UIAlignBox extends UICollapsibleBox { return visImageButton; } - private class AlignmentButtonClickListener extends ClickListener { + private static class AlignmentButtonClickListener extends ClickListener { private final int alignment; diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java index d6747563..9db36023 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java @@ -72,7 +72,7 @@ public class UIToolBox extends VisTable { return visImageButton; } - private class ToolboxButtonClickListener extends ClickListener { + private static class ToolboxButtonClickListener extends ClickListener { private final String toolId; diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java b/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java index 1ec83c7b..e228a822 100644 --- a/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java +++ b/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java @@ -103,7 +103,7 @@ public class SettingsDialog extends H2DDialog { } private void applyAllSettings() { - for (SettingsNode node : settingsTree.getNodes()) { + for (SettingsNode node : settingsTree.getRootNodes()) { if (node.getValue().validateSettings()) { node.getValue().translateViewToSettings(); } @@ -120,8 +120,8 @@ public class SettingsDialog extends H2DDialog { @Override public VisDialog show(Stage stage) { super.show(stage); - if (settingsTree.getSelection().size() == 0 && settingsTree.getNodes().size > 0) { - settingsTree.getSelection().add(settingsTree.getNodes().first()); + if (settingsTree.getSelection().size() == 0 && settingsTree.getRootNodes().size > 0) { + settingsTree.getSelection().add(settingsTree.getRootNodes().first()); } if (settingsTree.getSelection().size() > 0) { @@ -142,12 +142,12 @@ public class SettingsDialog extends H2DDialog { public SettingsNode addSettingsNode(SettingsNodeValue nodeValue) { SettingsNode node = new SettingsNode(nodeValue.getName()); - int existingIndex = settingsTree.getNodes().indexOf(node, false); + int existingIndex = settingsTree.getRootNodes().indexOf(node, false); if (existingIndex == -1) { node.setValue(nodeValue); settingsTree.add(node); } else { - settingsTree.getNodes().get(existingIndex).setValue(nodeValue); + settingsTree.getRootNodes().get(existingIndex).setValue(nodeValue); } return node; }