- merge with local

src/tonegod/gui/controls/extras/ChatBox.java

@@ -264,5 +264,5 @@ public void setToolTipTextInput(String tip) {
 	 */
 	public void setToolTipSendButton(String tip) {
 		this.btnChatSendMsg.setToolTipText(tip);
-	}
+    }
 }

src/tonegod/gui/controls/extras/Indicator.java

@@ -41,7 +41,7 @@ public Indicator(ElementManager screen, Orientation orientation) {
 			screen.getStyle("Indicator").getVector2f("defaultSize"),
 			screen.getStyle("Indicator").getVector4f("resizeBorders"),
 			screen.getStyle("Indicator").getString("defaultImg"),
-			orientation
+			orientation, true
 		);
 	}
 
@@ -56,7 +56,7 @@ public Indicator(ElementManager screen, Vector2f position, Orientation orientati
 			screen.getStyle("Indicator").getVector2f("defaultSize"),
 			screen.getStyle("Indicator").getVector4f("resizeBorders"),
 			screen.getStyle("Indicator").getString("defaultImg"),
-			orientation
+			orientation, true
 		);
 	}
 
@@ -67,11 +67,11 @@ public Indicator(ElementManager screen, Vector2f position, Orientation orientati
 	 * @param position A Vector2f containing the x/y position of the Element
 	 * @param dimensions A Vector2f containing the width/height dimensions of the Element
 	 */
-	public Indicator(ElementManager screen, Vector2f position, Vector2f dimensions, Orientation orientation) {
+	public Indicator(ElementManager screen, Vector2f position, Vector2f dimensions, Orientation orientation, boolean useOverlay) {
 		this(screen, UIDUtil.getUID(), position, dimensions,
 			screen.getStyle("Indicator").getVector4f("resizeBorders"),
 			screen.getStyle("Indicator").getString("defaultImg"),
-			orientation
+			orientation, useOverlay
 		);
 	}
 
@@ -85,7 +85,7 @@ public Indicator(ElementManager screen, Vector2f position, Vector2f dimensions,
 	 * @param defaultImg The default image to use for the Element
 	 */
 	public Indicator(ElementManager screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
-		this(screen, UIDUtil.getUID(), position, dimensions, resizeBorders, defaultImg, orientation);
+		this(screen, UIDUtil.getUID(), position, dimensions, resizeBorders, defaultImg, orientation, true);
 	}
 
 	/**
@@ -100,7 +100,7 @@ public Indicator(ElementManager screen, String UID, Vector2f position, Orientati
 			screen.getStyle("Indicator").getVector2f("defaultSize"),
 			screen.getStyle("Indicator").getVector4f("resizeBorders"),
 			screen.getStyle("Indicator").getString("defaultImg"),
-			orientation
+			orientation, true
 		);
 	}
 
@@ -116,7 +116,7 @@ public Indicator(ElementManager screen, String UID, Vector2f position, Vector2f
 		this(screen, UID, position, dimensions,
 			screen.getStyle("Indicator").getVector4f("resizeBorders"),
 			screen.getStyle("Indicator").getString("defaultImg"),
-			orientation
+			orientation, true
 		);
 	}
 
@@ -130,7 +130,7 @@ public Indicator(ElementManager screen, String UID, Vector2f position, Vector2f
 	 * @param resizeBorders A Vector4f containing the border information used when resizing the default image (x = N, y = W, z = E, w = S)
 	 * @param defaultImg The default image to use for the Indicator
 	 */
-	public Indicator(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
+	public Indicator(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation, boolean useOverlay) {
 		super(screen, UID, position, dimensions, resizeBorders, null);
 
 		indDimensions.set(dimensions);
@@ -186,29 +186,31 @@ public void updateLocalClippingLayer() {
 		elIndicator.setScaleNS(false);
 		addChild(elIndicator);
 
-		elOverlay = new Element(
-			screen,
-			UID + ":Overlay",
-			Vector2f.ZERO,
-			dimensions,
-			resizeBorders,
-			overlayImg
-		);
-		elOverlay.setIgnoreMouse(true);
-		elOverlay.setDocking(Docking.SW);
-		elOverlay.setScaleEW(true);
-		elOverlay.setScaleNS(false);
-
-		// Load default font info
-		elOverlay.setFontColor(screen.getStyle("Indicator").getColorRGBA("fontColor"));
-		elOverlay.setFontSize(screen.getStyle("Indicator").getFloat("fontSize"));
-		elOverlay.setTextAlign(BitmapFont.Align.valueOf(screen.getStyle("Indicator").getString("textAlign")));
-		elOverlay.setTextVAlign(BitmapFont.VAlign.valueOf(screen.getStyle("Indicator").getString("textVAlign")));
-		elOverlay.setTextWrap(LineWrapMode.valueOf(screen.getStyle("Indicator").getString("textWrap")));
-		elOverlay.setTextClipPaddingByKey("Indicator","textPadding");
-		elOverlay.setTextPaddingByKey("Indicator","textPadding");
-
-		addChild(elOverlay);
+                    elOverlay = new Element(
+                            screen,
+                            UID + ":Overlay",
+                            Vector2f.ZERO,
+                            dimensions,
+                            resizeBorders,
+                            overlayImg
+                    );
+                    elOverlay.setIgnoreMouse(true);
+                    elOverlay.setDocking(Docking.SW);
+                    elOverlay.setScaleEW(true);
+                    elOverlay.setScaleNS(false);
+
+                    // Load default font info
+                    elOverlay.setFontColor(screen.getStyle("Indicator").getColorRGBA("fontColor"));
+                    elOverlay.setFontSize(screen.getStyle("Indicator").getFloat("fontSize"));
+                    elOverlay.setTextAlign(BitmapFont.Align.valueOf(screen.getStyle("Indicator").getString("textAlign")));
+                    elOverlay.setTextVAlign(BitmapFont.VAlign.valueOf(screen.getStyle("Indicator").getString("textVAlign")));
+                    elOverlay.setTextWrap(LineWrapMode.valueOf(screen.getStyle("Indicator").getString("textWrap")));
+                    elOverlay.setTextClipPaddingByKey("Indicator","textPadding");
+                    elOverlay.setTextPaddingByKey("Indicator","textPadding");
+
+                if(useOverlay) {
+                    addChild(elOverlay);
+                }
 
 	}
 

src/tonegod/gui/controls/lists/SelectBox.java

@@ -120,4 +120,9 @@ public final void setIsEnabled(boolean isEnabled) {
 		selectEnabled = isEnabled;
 		this.btnArrowDown.setIsEnabled(isEnabled);
 	}
+
+        @Override
+        public boolean getIsEnabled() {
+                return selectEnabled;
+        }    
 }

src/tonegod/gui/controls/lists/Spinner.java

@@ -326,10 +326,10 @@ public void setSelectedIndexWithCallback(int selectedIndex) {
 			selectedIndex = 0;
 		else if (selectedIndex > stepValues.size()-1)
 			selectedIndex = stepValues.size()-1;
-
+		ChangeType change = selectedIndex > this.selectedIndex ? ChangeType.INC : ChangeType.DEC;
 		this.selectedIndex = selectedIndex;
 		displaySelectedStep();
-		onChange(selectedIndex, stepValues.get(selectedIndex));
+		onChange(selectedIndex, stepValues.get(selectedIndex), change);
 	}
 
 	/**
@@ -356,7 +356,7 @@ private void incStep() {
 			}
 		}
 		displaySelectedStep();
-		onChange(selectedIndex, stepValues.get(selectedIndex));
+		onChange(selectedIndex, stepValues.get(selectedIndex), ChangeType.INC);
 	}
 
 	private void decStep() {
@@ -369,7 +369,7 @@ private void decStep() {
 			}
 		}
 		displaySelectedStep();
-		onChange(selectedIndex, stepValues.get(selectedIndex));
+		onChange(selectedIndex, stepValues.get(selectedIndex), ChangeType.DEC);
 	}
 
 	private void displaySelectedStep() {
@@ -392,5 +392,10 @@ public void controlKeyPressHook(KeyInputEvent evt, String text) {
 	 * @param selectedIndex int The new selectedIndex
 	 * @param value The value associated with the selected index
 	 */
-	public abstract void onChange(int selectedIndex, String value);	
+	public abstract void onChange(int selectedIndex, String value, ChangeType changeType);
+
+        public enum ChangeType{
+            INC,
+            DEC;
+        }
 }

src/tonegod/gui/controls/windows/Window.java

@@ -302,15 +302,15 @@ public boolean getWindowIsMovable() {
 
 	public void addWindowContent(Element el) {
 		contentArea.addChild(el);
-		contentArea.addClippingLayer(contentArea);
+//		contentArea.addClippingLayer(contentArea); // Cause issue when used with Button
 	}
 
 	public void removeWindowContent(Element el) {
 		contentArea.removeChild(el);
 	}
 
 	public void setContentLayout(Layout layout) {
-		contentArea.setLayout(layout);;
+		contentArea.setLayout(layout);
 	}
 
 	public Element getContentArea() { return contentArea; }

src/tonegod/gui/style/LayoutParser.java

@@ -306,7 +306,7 @@ private Element createElement(Element el, Class c, String id, String pos, String
                         Boolean bool = Boolean.parseBoolean(flag);
                         return new Spinner(screen, id, position, dimensions, resizeBorders, img, orientation, bool) {
                                 @Override
-                                public void onChange(int selectedIndex, String value) {
+                                public void onChange(int selectedIndex, String value, ChangeType type) {
                                         for (int n = 0; n < childNodes.getLength(); n++) {
                                                 org.w3c.dom.Node childNode = childNodes.item(n);
                                                 if (childNode.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
@@ -413,7 +413,7 @@ public void onComplete(ColorRGBA color) {
                         };
                 } else if (className.equals("Indicator")) {
                         Indicator.Orientation orientation = Indicator.Orientation.valueOf(ori);
-                        return new Indicator(screen, id, position, dimensions, resizeBorders, img, orientation) {
+                        return new Indicator(screen, id, position, dimensions, resizeBorders, img, orientation, true) {
                                 @Override
                                 public void onChange(float currentValue, float currentPercentage) {
                                         for (int n = 0; n < childNodes.getLength(); n++) {