From c3f00fe5b67feba027e27f0a182a773abadbda1a Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Sat, 17 Mar 2018 00:10:26 -0500
Subject: [PATCH] removed song counter on options page, made sure background
 will resize to non standard resolutions

---
 core/src/zero1hd/rhythmbullet/RhythmBullet.java  |  2 +-
 .../desktop/graphics/ui/pages/OptionsPage.java   | 16 +---------------
 .../desktop/screens/MainMenuScreen.java          |  4 ++--
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/core/src/zero1hd/rhythmbullet/RhythmBullet.java b/core/src/zero1hd/rhythmbullet/RhythmBullet.java
index 55bdd48..a83461d 100755
--- a/core/src/zero1hd/rhythmbullet/RhythmBullet.java
+++ b/core/src/zero1hd/rhythmbullet/RhythmBullet.java
@@ -63,7 +63,7 @@ public class RhythmBullet extends Game {
 	@Override
 	public void create() {
 		Gdx.app.setLogLevel(Application.LOG_DEBUG);
-		prefs = Gdx.app.getPreferences("PolyJet_Preferences");
+		prefs = Gdx.app.getPreferences("RhythmBullet Preferences");
 		
 		if (getPrefs().getBoolean("fullscreen", true)) {
 			Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java
index 0e461ce..a4dff04 100755
--- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java
+++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java
@@ -1,8 +1,5 @@
 package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
 
-import java.util.Observable;
-import java.util.Observer;
-
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Preferences;
 import com.badlogic.gdx.math.MathUtils;
@@ -19,7 +16,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import zero1hd.rhythmbullet.RhythmBullet;
 import zero1hd.rhythmbullet.desktop.audio.MusicListController;
 
-public class OptionsPage extends Page implements Observer {
+public class OptionsPage extends Page {
 	Table optionsTable;
 	private ProgressBar musicVolSlider;
 	private ProgressBar fxVolSlider;
@@ -27,7 +24,6 @@ public class OptionsPage extends Page implements Observer {
 	private MusicListController mlc;
 	private float musicSearchTimer;
 	
-	private Label songCount;
 	public OptionsPage(final RhythmBullet core, final Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, final MusicListController mlc) {
 		super("General", core.getDefaultSkin());
 		this.mlc = mlc;
@@ -88,7 +84,6 @@ public class OptionsPage extends Page implements Observer {
 		
 		Label musicDirectoryLabel = new Label("Music Directory: ", core.getDefaultSkin());
 		optionsTable.add(musicDirectoryLabel);
-		songCount = new Label("Songs: " + mlc.getMusicList().getTotal(), core.getDefaultSkin(), "sub-font", core.getDefaultSkin().getColor("default"));
 		directoryField = new TextField(null, core.getDefaultSkin() ) {
 			@Override
 			public void act(float delta) {
@@ -107,11 +102,9 @@ public class OptionsPage extends Page implements Observer {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {
 				musicSearchTimer = 2;
-				songCount.setText("...");
 			}
 		});
 		optionsTable.add(directoryField).fillX();
-		optionsTable.add(songCount);
 		
 		optionsTable.row();
 		
@@ -169,13 +162,6 @@ public class OptionsPage extends Page implements Observer {
 		Gdx.app.debug("Preferences", "Saved all basic options page values.");
 	}
 
-	@Override
-	public void update(Observable arg0, Object arg1) {
-		if (arg0 == mlc.getMusicList()) {
-			songCount.setText(mlc.getMusicList().getTotal() + " songs");
-		}
-	}
-	
 	@Override
 	public void dispose() {
 		super.dispose();
diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenuScreen.java b/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenuScreen.java
index 08f4538..9f9bdef 100755
--- a/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenuScreen.java
+++ b/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenuScreen.java
@@ -109,7 +109,7 @@ public class MainMenuScreen extends ScreenAdapter implements AdvancedResizeScree
 			screenBatch.draw(fboRegion, 0, 0, stage.getWidth(), stage.getHeight());
 			screenBatch.flush();
 			lightFilterBuffer.end();
-//			
+			
 			for (int i = 0; i < blurlvl; i++) {
 //				Horizontal gaussian blur
 				hBlur.begin();
@@ -157,7 +157,7 @@ public class MainMenuScreen extends ScreenAdapter implements AdvancedResizeScree
 	private void draw() {
 		if (background != null) {
 			screenBatch.begin();
-			screenBatch.draw(background, 0, 0);
+			screenBatch.draw(background, 0, 0, stage.getWidth(), stage.getHeight());
 			screenBatch.end();
 		}
 		stage.draw();