Merge remote-tracking branch 'Stan/development' into development

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeView.java

 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DColorableIconInstance;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 		int rowIndex = yToRow(e.y);
 		if (rowIndex >= 0 && rowIndex < rows.size()) {
 			Row rowEntry = rows.get(rowIndex);
-			if (e.x >= rowEntry.x && e.x < (rowEntry.x + nodeOpenedIcon.getNominalWidth())) {
+			if (e.x >= rowEntry.x && e.x < (rowEntry.x + getIconWidth(nodeOpenedIcon))) {
 				if (!rowEntry.node.isLeaf())
 					rowEntry.node.isCollapsed().toggle();
 				return;
 				int selectionY = bounds.y + style.padding + rowIndex * (style.rowSpacing + fontMetrics.getAscent() + fontMetrics.getDescent()) - style.selectedPaddingTop;
 				int selectionWidth = (int)(fontMetrics.getWidth(row.node.getTitle())
 						+ style.iconTextSpacing
-						+ row.icon.getNominalWidth()
+						+ getIconWidth(row.icon)
 						+ style.iconTextSpacing
-						+ row.node.getIcon().getNominalWidth()
+						+ getIconWidth(row.node.getIcon())
 						+ style.selectedPaddingLeft
 						+ style.selectedPaddingRight);
 				int selectionHeight = fontMetrics.getAscent() + fontMetrics.getDescent() + style.selectedPaddingTop + style.selectedPaddingBottom;
 				
 				if (row.node.isLeaf()) {
-					int delta = (int)(row.icon.getNominalWidth() + style.iconTextSpacing);
+					int delta = (int)(getIconWidth(row.icon) + style.iconTextSpacing);
 					selectionX += delta;
 					selectionWidth -= delta;
 				}
 		return (y - bounds.y - style.padding) / (style.rowSpacing + fontMetrics.getAscent() + fontMetrics.getDescent());
 	}
 	
+	private float getIconWidth(DDrawable drawable) {
+		return drawable.getNominalWidth() * iconScale;
+	}
+	
+	private float getIconHeight(DDrawable drawable) {
+		return drawable.getNominalHeight() * iconScale; 
+	}
+	
+	private float getIconWidth(DColorableIcon icon) {
+		return icon.getNominalWidth() * iconScale;
+	}
+	
+	private float getIconHeight(DColorableIcon icon) {
+		return icon.getNominalHeight() * iconScale; 
+	}
+	
 	private void updateLayout() {
 		int oldRowCount = rows.size();
 		
 					context.surface,
 					context.z + 2,
 					node.getIcon(),
-					DTransform2D.scaleAndTranslate(baseX + icon.getNominalWidth() + style.iconTextSpacing, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight(), iconScale),
+					DTransform2D.scaleAndTranslate(baseX + getIconWidth(icon) + style.iconTextSpacing, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon), iconScale),
 					node == selectedNode ? style.selectedNodeTextColor : style.nodeTextColor);
 			
 			if (!node.isLeaf())
 						context.surface, 
 						context.z + 2,
 						icon,
-						DTransform2D.scaleAndTranslate(baseX, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight(), iconScale));
+						DTransform2D.scaleAndTranslate(baseX, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon), iconScale));
 			
 			text = context.drawText(
 					2,
 					style.font,
 					node == selectedNode ? style.selectedNodeTextColor : style.nodeTextColor,
-					baseX + style.iconTextSpacing + icon.getNominalWidth() + style.iconTextSpacing + node.getIcon().getNominalWidth(),
+					baseX + style.iconTextSpacing + getIconWidth(icon) + style.iconTextSpacing + getIconWidth(node.getIcon()),
 					baseY + fontMetrics.getAscent(),
 					node.getTitle());
 		}
 			if (collapseIcon != null) {
 				collapseIcon.setTransform(DTransform2D.scaleAndTranslate(
 						baseX,
-						baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight(),
+						baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon),
 						iconScale));
 			}
 			nodeIcon.setTransform(DTransform2D.scaleAndTranslate(
-					baseX + icon.getNominalWidth() + style.iconTextSpacing,
-					baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight(),
+					baseX + getIconWidth(icon) + style.iconTextSpacing,
+					baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon),
 					iconScale));
 			text.setPosition(
-					baseX + style.iconTextSpacing + icon.getNominalWidth() + style.iconTextSpacing + node.getIcon().getNominalWidth(),
+					baseX + style.iconTextSpacing + getIconWidth(icon) + style.iconTextSpacing + getIconWidth(node.getIcon()),
 					baseY + fontMetrics.getAscent());
 		}