v0.3.1: made display scaling a bit more strict on lower values.

This commit is contained in:
Evan Debenham
2015-07-02 03:09:13 -04:00
committed by Evan Debenham
parent e881dcf4f3
commit 23162fcc82
2 changed files with 4 additions and 3 deletions
@@ -79,7 +79,7 @@ public class PixelScene extends Scene {
} }
defaultZoom = ShatteredPixelDungeon.scale(); defaultZoom = ShatteredPixelDungeon.scale();
if (defaultZoom < Game.density){ if (defaultZoom < Math.ceil( Game.density * 2 )){
defaultZoom = (int)Math.ceil( Game.density * 2.5 ); defaultZoom = (int)Math.ceil( Game.density * 2.5 );
while (( while ((
Game.width / defaultZoom < minWidth || Game.width / defaultZoom < minWidth ||
@@ -103,12 +103,13 @@ public class WndSettings extends Window {
protected void onClick() { protected void onClick() {
super.onClick(); super.onClick();
setScale++; setScale++;
if (setScale > PixelScene.maxDefaultZoom) setScale = (int)Math.ceil(Game.density); if (setScale > PixelScene.maxDefaultZoom) setScale = (int)Math.ceil(2*Game.density);
this.text(Utils.format(TXT_SCALE, setScale)); this.text(Utils.format(TXT_SCALE, setScale));
} }
}; };
btnScaleUp.setRect( 0, 0, WIDTH, BTN_HEIGHT ); btnScaleUp.setRect( 0, 0, WIDTH, BTN_HEIGHT );
add( btnScaleUp ); btnScaleUp.enable(PixelScene.maxDefaultZoom > Math.ceil(2*Game.density));
add(btnScaleUp);
btnImmersive = new CheckBox( TXT_IMMERSIVE ) { btnImmersive = new CheckBox( TXT_IMMERSIVE ) {
@Override @Override