diff --git a/android/assets/uiskin.atlas b/android/assets/uiskin.atlas index d6ff806..7f7fd97 100755 --- a/android/assets/uiskin.atlas +++ b/android/assets/uiskin.atlas @@ -24,7 +24,7 @@ check-disabled rotate: false xy: 192, 20 size: 14, 14 - split: 5, 5, 5, 5 + split: 3, 3, 3, 3 orig: 14, 14 offset: 0, 0 index: -1 diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index 6a02a04..7061582 100755 Binary files a/android/assets/uiskin.png and b/android/assets/uiskin.png differ diff --git a/core/src/zero1hd/rhythmbullet/RhythmBullet.java b/core/src/zero1hd/rhythmbullet/RhythmBullet.java index 11e0c5d..e37b108 100755 --- a/core/src/zero1hd/rhythmbullet/RhythmBullet.java +++ b/core/src/zero1hd/rhythmbullet/RhythmBullet.java @@ -293,7 +293,7 @@ public class RhythmBullet extends Game { getDefaultSkin().add("default", defaultScrollPane); 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); SelectBoxStyle defaultSelectBox = new SelectBoxStyle(getDefaultSkin().getFont("default-font"), getDefaultSkin().getColor("default"), getDefaultSkin().getDrawable("default-select"), defaultScrollPane, defaultList); diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java b/core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java index 9dd14db..53c1737 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/components/GraphicsOptions.java @@ -47,9 +47,9 @@ public class GraphicsOptions extends Table { mainMenu.loadShaders(); enhancedGlow.setDisabled(false); } else { - mainMenu.unloadShaders(); enhancedGlow.setChecked(false); enhancedGlow.setDisabled(true); + mainMenu.unloadShaders(); } } }); @@ -58,6 +58,7 @@ public class GraphicsOptions extends Table { enhancedGlow = new CheckBox(" Enhanced Glow", skin); enhancedGlow.setChecked(prefs.getBoolean("enhanced glow", false)); + enhancedGlow.setDisabled(!prefs.getBoolean("glow shader", false)); enhancedGlow.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java index 6cfce90..45cdef8 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java @@ -91,7 +91,7 @@ public class MainPage extends Page implements OnDifferentSongListener { scrollText.setPosition(((getWidth() - scrollText.getWidth())/2f), getHeight() - scrollText.getFontHeight()*1.5f); if (scrollText.getX() + scrollText.getWidth() > musicControls.getX()) { 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); musicControls.setY(scrollText.getY() + 22f); musicControls.invalidate();