ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed crash issue with shader options checkbox; changed checkbox disabled texture

Browse Source
This commit is contained in:
Harrison Deng
2017-10-15 19:33:46 -05:00
parent 879921e5aa
commit 69f40f5468
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/uiskin.atlas
View File

@@ -24,7 +24,7 @@ check-disabled
rotate: false rotate: false
xy: 192, 20 xy: 192, 20
size: 14, 14 size: 14, 14
split: 5, 5, 5, 5 split: 3, 3, 3, 3
orig: 14, 14 orig: 14, 14
offset: 0, 0 offset: 0, 0
index: -1 index: -1

BIN
android/assets/uiskin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
core/src/zero1hd/rhythmbullet/RhythmBullet.java
View File

@@ -293,7 +293,7 @@ public class RhythmBullet extends Game {
getDefaultSkin().add("default", defaultScrollPane); getDefaultSkin().add("default", defaultScrollPane);
CheckBoxStyle defaultCheckBox = new CheckBoxStyle(getDefaultSkin().getDrawable("check-off"), getDefaultSkin().getDrawable("check-on"), getDefaultSkin().getFont("window-font"), getDefaultSkin().getColor("default")); CheckBoxStyle defaultCheckBox = new CheckBoxStyle(getDefaultSkin().getDrawable("check-off"), getDefaultSkin().getDrawable("check-on"), getDefaultSkin().getFont("window-font"), getDefaultSkin().getColor("default"));
defaultCheckBox.disabled = getDefaultSkin().getDrawable("check-disabled"); defaultCheckBox.checkboxOffDisabled = getDefaultSkin().getDrawable("check-disabled");
getDefaultSkin().add("default", defaultCheckBox); getDefaultSkin().add("default", defaultCheckBox);
SelectBoxStyle defaultSelectBox = new SelectBoxStyle(getDefaultSkin().getFont("default-font"), getDefaultSkin().getColor("default"), getDefaultSkin().getDrawable("default-select"), defaultScrollPane, defaultList); SelectBoxStyle defaultSelectBox = new SelectBoxStyle(getDefaultSkin().getFont("default-font"), getDefaultSkin().getColor("default"), getDefaultSkin().getDrawable("default-select"), defaultScrollPane, defaultList);

3
core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java
View File

@@ -47,9 +47,9 @@ public class GraphicsOptions extends Table {
mainMenu.loadShaders(); mainMenu.loadShaders();
enhancedGlow.setDisabled(false); enhancedGlow.setDisabled(false);
} else { } else {
mainMenu.unloadShaders();
enhancedGlow.setChecked(false); enhancedGlow.setChecked(false);
enhancedGlow.setDisabled(true); enhancedGlow.setDisabled(true);
mainMenu.unloadShaders();
} }
} }
}); });
@@ -58,6 +58,7 @@ public class GraphicsOptions extends Table {
enhancedGlow = new CheckBox(" Enhanced Glow", skin); enhancedGlow = new CheckBox(" Enhanced Glow", skin);
enhancedGlow.setChecked(prefs.getBoolean("enhanced glow", false)); enhancedGlow.setChecked(prefs.getBoolean("enhanced glow", false));
enhancedGlow.setDisabled(!prefs.getBoolean("glow shader", false));
enhancedGlow.addListener(new ChangeListener() { enhancedGlow.addListener(new ChangeListener() {
@Override @Override
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {

2
core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java
View File

@@ -91,7 +91,7 @@ public class MainPage extends Page implements OnDifferentSongListener {
scrollText.setPosition(((getWidth() - scrollText.getWidth())/2f), getHeight() - scrollText.getFontHeight()*1.5f); scrollText.setPosition(((getWidth() - scrollText.getWidth())/2f), getHeight() - scrollText.getFontHeight()*1.5f);
if (scrollText.getX() + scrollText.getWidth() > musicControls.getX()) { if (scrollText.getX() + scrollText.getWidth() > musicControls.getX()) {
Gdx.app.debug("MainPage", "using minimal layout for scrolling text."); Gdx.app.debug("MainPage", "using minimal layout for scrolling text.");
musicControls.setX(getWidth() - musicControls.getMinWidth() - 5f); musicControls.setX(getWidth() - musicControls.getMinWidth() - 10f);
scrollText.setPosition(15, getHeight() - scrollText.getHeight() - 15f); scrollText.setPosition(15, getHeight() - scrollText.getHeight() - 15f);
musicControls.setY(scrollText.getY() + 22f); musicControls.setY(scrollText.getY() + 22f);
musicControls.invalidate(); musicControls.invalidate();