From d24f52f361664bd83847ee1849bcbdc168c5625b Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Fri, 16 Jun 2017 19:43:12 -0400
Subject: [PATCH] v0.6.1: adjusted the layouts for quickslots and item slots

---
 .../shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java   | 6 ++++++
 .../shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java
index 003ef11c2..be992f8b7 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java
@@ -122,6 +122,12 @@ public class ItemSlot extends Button {
 		PixelScene.align(icon);
 		
 		if (topLeft != null) {
+			topLeft.measure();
+			if (topLeft.width > width){
+				topLeft.scale.set(PixelScene.align(0.8f));
+			} else {
+				topLeft.scale.set(1f);
+			}
 			topLeft.x = x;
 			topLeft.y = y;
 			PixelScene.align(topLeft);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
index 01fb40b01..fd14428b1 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
@@ -23,13 +23,13 @@ package com.shatteredpixel.shatteredpixeldungeon.ui;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTilemap;
 import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
+import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTilemap;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndCatalogs;
 import com.watabou.noosa.Game;
@@ -162,8 +162,8 @@ public class Toolbar extends Component {
 		for(int i = 0; i <= 3; i++) {
 			btnQuick[i].visible = btnQuick[i].active = slots > i;
 			//decides on quickslot layout, depending on available screen size.
-			if (slots == 4 && width < 150){
-				if (width < 139){
+			if (slots == 4 && width < 152){
+				if (width < 138){
 					if ((ShatteredPixelDungeon.flipToolbar() && i == 3) ||
 							(!ShatteredPixelDungeon.flipToolbar() && i == 0)) {
 						btnQuick[i].border(0, 0);