From a1278eed9bac2eb764d35c9d80b85f23df4f47c0 Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Tue, 24 Oct 2017 20:11:49 -0500
Subject: [PATCH] main page ui changes, working on song name scroll text

---
 .../graphics/ui/components/MusicControls.java       |  5 ++++-
 .../graphics/ui/components/ScrollText.java          |  2 ++
 .../rhythmbullet/graphics/ui/pages/MainPage.java    | 13 +++----------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java b/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java
index 6e4a415..2860bfb 100755
--- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java
+++ b/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java
@@ -1,6 +1,5 @@
 package zero1hd.rhythmbullet.graphics.ui.components;
 
-import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
 import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
@@ -93,10 +92,14 @@ public class MusicControls extends HorizontalGroup {
 		invalidate();
 		
 		debugAll();
+		debug();
 	}
 	
 	@Override
 	public void act(float delta) {
+		setWidth(getMinWidth());
+		setHeight(getMinHeight());
+		
 		if (disableTimer > 0) {
 			disableTimer -= delta;
 			if (disableTimer <= 0) {
diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java b/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java
index 7e71c64..4fee9c7 100755
--- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java
+++ b/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java
@@ -100,6 +100,8 @@ public class ScrollText extends Widget {
 	@Override
 	public void act(float delta) {
 		validate();
+		setSize(getMinWidth(), textHeight + 4);
+		clipBounds.setSize(getWidth()-2, getHeight()*1.5f);
 		if (text1Width + text2Width > clipBounds.getWidth()) {
 			if (scrollOnHover) {
 				if (scroll || text1Offset < 0 || text1Offset > 5) {
diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java
index 1f9a24e..02ca857 100755
--- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java
+++ b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java
@@ -84,20 +84,13 @@ public class MainPage extends Page implements Observer {
 		table.add(quitButton).fillX();
 		
 		musicControls = new MusicControls(core.getDefaultSkin(), sc);
-		musicControls.setPosition((getWidth()-musicControls.getMinWidth() - 20f), getHeight()-musicControls.getMinHeight()*1.5f -15f);
+		musicControls.setPosition((getWidth()-musicControls.getMinWidth() - 20f), getHeight()-musicControls.getMinHeight()-15f);
 		musicControls.invalidate();
 		addActor(musicControls);
 		
 		scrollText = new ScrollText("...", "...", core.getDefaultSkin(), false, true);
-		scrollText.setWidth((0.4f * getWidth()));
-		scrollText.setPosition(((getWidth() - scrollText.getWidth())/2f), 0.8f*Gdx.graphics.getHeight());
-		if (scrollText.getX() + scrollText.getWidth() > musicControls.getX()) {
-			Gdx.app.debug("MainPage", "using minimal layout for scrolling text.");
-			musicControls.setX(getWidth() - musicControls.getMinWidth() - 10f);
-			musicControls.setY(Gdx.graphics.getHeight() - 45f);
-			scrollText.setPosition(15, getHeight() - scrollText.getHeight() - 15f);
-			musicControls.invalidate();
-		}
+		scrollText.setWidth(Gdx.graphics.getWidth() - musicControls.getWidth() - 30f);
+		scrollText.setPosition(musicControls.getX() - scrollText.getWidth() - 20f, Gdx.graphics.getHeight() - 15f);
 		scrollText.invalidate();
 		addActor(scrollText);