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

main page ui changes, working on song name scroll text

Browse Source
This commit is contained in:
Harrison Deng 2017-10-24 20:11:49 -05:00
parent 92d122616f
commit a1278eed9b
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicControls.java
View File

@ -1,6 +1,5 @@
package zero1hd.rhythmbullet.graphics.ui.components; 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.Actor;
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox; import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup; import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
@ -93,10 +92,14 @@ public class MusicControls extends HorizontalGroup {
invalidate(); invalidate();
debugAll(); debugAll();
debug();
} }
@Override @Override
public void act(float delta) { public void act(float delta) {
setWidth(getMinWidth());
setHeight(getMinHeight());
if (disableTimer > 0) { if (disableTimer > 0) {
disableTimer -= delta; disableTimer -= delta;
if (disableTimer <= 0) { if (disableTimer <= 0) {

2
core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java
View File

@ -100,6 +100,8 @@ public class ScrollText extends Widget {
@Override @Override
public void act(float delta) { public void act(float delta) {
validate(); validate();
setSize(getMinWidth(), textHeight + 4);
clipBounds.setSize(getWidth()-2, getHeight()*1.5f);
if (text1Width + text2Width > clipBounds.getWidth()) { if (text1Width + text2Width > clipBounds.getWidth()) {
if (scrollOnHover) { if (scrollOnHover) {
if (scroll || text1Offset < 0 || text1Offset > 5) { if (scroll || text1Offset < 0 || text1Offset > 5) {

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

@ -84,20 +84,13 @@ public class MainPage extends Page implements Observer {
table.add(quitButton).fillX(); table.add(quitButton).fillX();
musicControls = new MusicControls(core.getDefaultSkin(), sc); 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(); musicControls.invalidate();
addActor(musicControls); addActor(musicControls);
scrollText = new ScrollText("...", "...", core.getDefaultSkin(), false, true); scrollText = new ScrollText("...", "...", core.getDefaultSkin(), false, true);
scrollText.setWidth((0.4f * getWidth())); scrollText.setWidth(Gdx.graphics.getWidth() - musicControls.getWidth() - 30f);
scrollText.setPosition(((getWidth() - scrollText.getWidth())/2f), 0.8f*Gdx.graphics.getHeight()); scrollText.setPosition(musicControls.getX() - scrollText.getWidth() - 20f, Gdx.graphics.getHeight() - 15f);
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.invalidate(); scrollText.invalidate();
addActor(scrollText); addActor(scrollText);