UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mouse scroll after focusing list. Fixed loading atlas for .skel.bytes data file.

Browse Source
This commit is contained in:
Nathan Sweet 2017-08-22 22:54:28 +02:00
parent 34086c1f41
commit 15e4f2ff4e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
View File

@ -142,7 +142,8 @@ public class SkeletonViewer extends ApplicationAdapter {
pixmap.dispose(); pixmap.dispose();
String atlasFileName = skeletonFile.nameWithoutExtension(); String atlasFileName = skeletonFile.nameWithoutExtension();
if (atlasFileName.endsWith(".json")) atlasFileName = new FileHandle(atlasFileName).nameWithoutExtension(); if (atlasFileName.endsWith(".json") || atlasFileName.endsWith(".skel"))
atlasFileName = atlasFileName.substring(0, atlasFileName.length() - 5);
FileHandle atlasFile = skeletonFile.sibling(atlasFileName + ".atlas"); FileHandle atlasFile = skeletonFile.sibling(atlasFileName + ".atlas");
if (!atlasFile.exists()) { if (!atlasFile.exists()) {
if (atlasFileName.endsWith("-pro") || atlasFileName.endsWith("-ess")) if (atlasFileName.endsWith("-pro") || atlasFileName.endsWith("-ess"))
@ -706,6 +707,16 @@ public class SkeletonViewer extends ApplicationAdapter {
} }
}); });
InputListener scrollFocusListener = new InputListener() {
public void enter (InputEvent event, float x, float y, int pointer, Actor fromActor) {
stage.setScrollFocus(event.getListenerActor());
}
public void exit (InputEvent event, float x, float y, int pointer, Actor toActor) {
if (stage.getScrollFocus() == event.getListenerActor()) stage.setScrollFocus(null);
}
};
animationList.addListener(new ChangeListener() { animationList.addListener(new ChangeListener() {
public void changed (ChangeEvent event, Actor actor) { public void changed (ChangeEvent event, Actor actor) {
if (state != null) { if (state != null) {
@ -717,6 +728,7 @@ public class SkeletonViewer extends ApplicationAdapter {
} }
} }
}); });
animationList.addListener(scrollFocusListener);
loopCheckbox.addListener(new ChangeListener() { loopCheckbox.addListener(new ChangeListener() {
public void changed (ChangeEvent event, Actor actor) { public void changed (ChangeEvent event, Actor actor) {
@ -736,6 +748,7 @@ public class SkeletonViewer extends ApplicationAdapter {
} }
} }
}); });
skinList.addListener(scrollFocusListener);
ChangeListener trackButtonListener = new ChangeListener() { ChangeListener trackButtonListener = new ChangeListener() {
public void changed (ChangeEvent event, Actor actor) { public void changed (ChangeEvent event, Actor actor) {