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

Merge branch 'master' of /home/ydeng/git/RhythmBullet

Browse Source
This commit is contained in:
Harrison Deng 2018-01-28 01:38:00 -06:00
commit 8c10e94246
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/assets/3840x2160/RhythmBulletMenuBG.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 452 KiB

5
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java
View File

@ -33,10 +33,9 @@ public class OptionsPage extends Page {
targetPosition.x = 0.5f*Gdx.graphics.getWidth(); targetPosition.x = 0.5f*Gdx.graphics.getWidth();
} }
}); });
backButton.setPosition(10, getHeightBelowTitle() + 5);
addActor(backButton);
backButton.setWidth(backButton.getWidth() + 20); backButton.setWidth(backButton.getWidth() + 20);
addSpaceToTitle(backButton.getWidth() + backButton.getX() + 20); backButton.setPosition(getWidth() - backButton.getWidth() - 10, getHeightBelowTitle() + 5);
addActor(backButton);
optionsTable = new Table(); optionsTable = new Table();
optionsTable.defaults().center().space(10f); optionsTable.defaults().center().space(10f);

10
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/Page.java
View File

@ -1,7 +1,6 @@
package zero1hd.rhythmbullet.desktop.graphics.ui.pages; package zero1hd.rhythmbullet.desktop.graphics.ui.pages;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.scenes.scene2d.Group; import com.badlogic.gdx.scenes.scene2d.Group;
import com.badlogic.gdx.scenes.scene2d.Touchable; import com.badlogic.gdx.scenes.scene2d.Touchable;
import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.Label;
@ -27,15 +26,6 @@ public class Page extends Group implements Disposable {
return pageTitle.getY(); return pageTitle.getY();
} }
@Override
public void draw(Batch batch, float parentAlpha) {
super.draw(batch, parentAlpha);
}
public void addSpaceToTitle(float space) {
pageTitle.moveBy(space, 0);
}
@Override @Override
public void dispose() { public void dispose() {
} }