Merging 1.7.5 Source: ui changes

This commit is contained in:
Evan Debenham
2015-01-30 14:05:10 -05:00
parent 4499685b09
commit 894f7d9d06
9 changed files with 148 additions and 37 deletions
@@ -29,6 +29,7 @@ import com.watabou.noosa.Group;
import com.watabou.noosa.NinePatch;
import com.watabou.noosa.TouchArea;
import com.shatteredpixel.shatteredpixeldungeon.Chrome;
import com.shatteredpixel.shatteredpixeldungeon.effects.ShadowBox;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.watabou.utils.Signal;
@@ -38,7 +39,8 @@ public class Window extends Group implements Signal.Listener<Key> {
protected int height;
protected TouchArea blocker;
protected NinePatch chrome;
protected ShadowBox shadow;
protected NinePatch chrome;
public static final int TITLE_COLOR = 0xFFFF44;
public static final int SHPX_COLOR = 0x33BB33;
@@ -69,10 +71,16 @@ public class Window extends Group implements Signal.Listener<Key> {
add( blocker );
this.chrome = chrome;
this.width = width;
this.height = height;
shadow = new ShadowBox();
shadow.am = 0.5f;
shadow.camera = PixelScene.uiCamera.visible ?
PixelScene.uiCamera : Camera.main;
add( shadow );
chrome.x = -chrome.marginLeft();
chrome.y = -chrome.marginTop();
chrome.size(
@@ -88,7 +96,12 @@ public class Window extends Group implements Signal.Listener<Key> {
camera.y = (int)(Game.height - camera.height * camera.zoom) / 2;
camera.scroll.set( chrome.x, chrome.y );
Camera.add( camera );
shadow.boxRect(
camera.x / camera.zoom,
camera.y / camera.zoom,
chrome.width(), chrome.height );
Keys.event.add( this );
}
@@ -103,6 +116,8 @@ public class Window extends Group implements Signal.Listener<Key> {
camera.resize( (int)chrome.width, (int)chrome.height );
camera.x = (int)(Game.width - camera.screenWidth()) / 2;
camera.y = (int)(Game.height - camera.screenHeight()) / 2;
shadow.boxRect( camera.x / camera.zoom, camera.y / camera.zoom, chrome.width(), chrome.height );
}
public void hide() {