From 69f40f546861c07fcfac4cbc30f90f9c0db14764 Mon Sep 17 00:00:00 2001 From: Recrown Date: Sun, 15 Oct 2017 19:33:46 -0500 Subject: [PATCH] fixed crash issue with shader options checkbox; changed checkbox disabled texture --- android/assets/uiskin.atlas | 2 +- android/assets/uiskin.png | Bin 11507 -> 11586 bytes .../zero1hd/rhythmbullet/RhythmBullet.java | 2 +- .../ui/components/GraphicsOptions.java | 3 ++- .../graphics/ui/pages/MainPage.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) 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 6a02a046ba2ca26b2e8865c11c4327e0c5e09983..706158246dfa65b678bf54882ec61e252350c30d 100755 GIT binary patch literal 11586 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 ZO|Fv7pu3I)|G61ZyrCkOab4f{{{V3YWDNiS literal 11507 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 VTz0LF0)LGRU@oaCWnVD5`+qwRWNQEb 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();