merging 1.7.5 source: windows changes

This commit is contained in:
Evan Debenham
2015-02-06 01:07:22 -05:00
parent 7cc5192839
commit 68406db6fe
18 changed files with 188 additions and 134 deletions
@@ -29,8 +29,9 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
public class WndChallenges extends Window {
private static final int WIDTH = 108;
private static final int BTN_HEIGHT = 20;
private static final int GAP = 2;
private static final int TTL_HEIGHT = 12;
private static final int BTN_HEIGHT = 18;
private static final int GAP = 1;
private static final String TITLE = "Challenges";
@@ -47,11 +48,12 @@ public class WndChallenges extends Window {
title.hardlight( TITLE_COLOR );
title.measure();
title.x = PixelScene.align( camera, (WIDTH - title.width()) / 2 );
title.y = PixelScene.align( camera, (TTL_HEIGHT - title.height()) / 2 );
add( title );
boxes = new ArrayList<CheckBox>();
float pos = title.height() + GAP;
float pos = TTL_HEIGHT;
for (int i=0; i < Challenges.NAMES.length; i++) {
CheckBox cb = new CheckBox( Challenges.NAMES[i] );