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

scroll text now centers duplicate text rotations

Browse Source
This commit is contained in:
Harrison Deng 2018-01-16 11:20:59 -06:00
parent 46541d9747
commit f5d3a01e76
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java
View File

@ -26,6 +26,7 @@ public class ScrollText extends Widget {
private float text1Width; private float text1Width;
private float text2Width; private float text2Width;
private boolean dupFirstText;
private boolean scrollOnHover; private boolean scrollOnHover;
private boolean scroll; private boolean scroll;
@ -104,13 +105,25 @@ public class ScrollText extends Widget {
public void act(float delta) { public void act(float delta) {
setSize(getWidth(), textHeight + 4); setSize(getWidth(), textHeight + 4);
clipBounds.setSize(getWidth()-2, getHeight()*1.5f); clipBounds.setSize(getWidth()-2, getHeight()*1.5f);
if (text1Width + text2Width > clipBounds.getWidth()) { if (dupFirstText) {
if (scrollOnHover) { if (text1Width > clipBounds.getWidth()) {
if (scroll || text1Offset < 0 || text1Offset > 2) { if (scrollOnHover) {
if (scroll || text1Offset < 0 || text1Offset > 2) {
scroll(delta);
}
} else {
scroll(delta);
}
}
} else {
if (text1Width + text2Width > clipBounds.getWidth()) {
if (scrollOnHover) {
if (scroll || text1Offset < 0 || text1Offset > 2) {
scroll(delta);
}
} else {
scroll(delta); scroll(delta);
} }
} else {
scroll(delta);
} }
} }
super.act(delta); super.act(delta);
@ -179,6 +192,7 @@ public class ScrollText extends Widget {
gLayout = new GlyphLayout(font, text2); gLayout = new GlyphLayout(font, text2);
text2Width = gLayout.width; text2Width = gLayout.width;
} else { } else {
dupFirstText = true;
this.text2 = text1; this.text2 = text1;
this.text2Width = text1Width; this.text2Width = text1Width;
} }