konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging Source v1.7.2: window changes

Browse Source
This commit is contained in:
Evan Debenham
2014-10-20 03:24:59 -04:00
parent 735af276c8
commit 33db534e25
8 changed files with 363 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
+19 -4
View File
@@ -33,6 +33,7 @@ public class WndSettings extends Window {
private static final String TXT_ZOOM_DEFAULT = "Default Zoom";
private static final String TXT_SCALE_UP = "Scale up UI";
private static final String TXT_IMMERSIVE = "Immersive mode";
private static final String TXT_MUSIC = "Music";
@@ -52,7 +53,9 @@ public class WndSettings extends Window {
public WndSettings( boolean inGame ) {
super();
CheckBox btnImmersive = null;
if (inGame) {
int w = BTN_HEIGHT;
@@ -94,8 +97,20 @@ public class WndSettings extends Window {
btnScaleUp.setRect( 0, 0, WIDTH, BTN_HEIGHT );
btnScaleUp.checked( ShatteredPixelDungeon.scaleUp() );
add( btnScaleUp );
}
btnImmersive = new CheckBox( TXT_IMMERSIVE ) {
@Override
protected void onClick() {
super.onClick();
ShatteredPixelDungeon.immerse( checked() );
}
};
btnImmersive.setRect( 0, btnScaleUp.bottom() + GAP, WIDTH, BTN_HEIGHT );
btnImmersive.checked( ShatteredPixelDungeon.immersed() );
btnImmersive.enable( android.os.Build.VERSION.SDK_INT >= 19 );
add( btnImmersive );
}
CheckBox btnMusic = new CheckBox( TXT_MUSIC ) {
@Override
@@ -104,7 +119,7 @@ public class WndSettings extends Window {
ShatteredPixelDungeon.music(checked());
}
};
btnMusic.setRect( 0, BTN_HEIGHT + GAP, WIDTH, BTN_HEIGHT );
btnMusic.setRect( 0, (btnImmersive != null ? btnImmersive.bottom() : BTN_HEIGHT) + GAP, WIDTH, BTN_HEIGHT );
btnMusic.checked( ShatteredPixelDungeon.music() );
add( btnMusic );