From: nathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Date: Sun, 19 Dec 2010 10:12:47 +0000 (+0000)
Subject: [fixed] TWL event consumption.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae6e400bce766cb851da4c526ca95a991e0cd3bc;p=mikumikustudio%2Flibgdx-mikumikustudio.git

[fixed] TWL event consumption.
[added] Iterable to utils collections.
---

diff --git a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java
index 71d568506..6adf32c8f 100644
--- a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java
+++ b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java
@@ -56,6 +56,8 @@ public class TWL implements InputProcessor {
 	private final GdxRenderer renderer = new GdxRenderer();
 	private final GUI gui;
 
+	private boolean mouseDown, ignoreMouse, lastPressConsumed;
+
 	/**
 	 * Creates a new TWL instance with the specified theme file. The specified widget is added to the root pane.
 	 */
@@ -142,24 +144,36 @@ public class TWL implements InputProcessor {
 	}
 
 	public boolean keyTyped (char character) {
-		boolean handled = gui.handleKey(0, character, true);
-		return gui.handleKey(0, character, false) || handled;
+		return gui.handleKey(0, character, true);
 	}
 
 	public boolean touchDown (int x, int y, int pointer) {
-		return gui.handleMouse(x, y, pointer, true);
+		if (!mouseDown) lastPressConsumed = false; // Only the first button down counts.
+		mouseDown = true;
+		if (ignoreMouse) return false;
+		boolean handled = gui.handleMouse(x, y, pointer, true);
+		if (handled) lastPressConsumed = true;
+		return handled;
 	}
 
 	public boolean touchUp (int x, int y, int pointer) {
+		mouseDown = false;
+		if (ignoreMouse) {
+			ignoreMouse = false;
+			return false;
+		}
 		boolean handled = gui.handleMouse(x, y, pointer, false);
-		gui.handleMouse(-9999, -9999, -1, true);
+		gui.handleMouse(-9999, -9999, -1, false);
 		return handled;
 	}
 
 	public boolean touchDragged (int x, int y, int pointer) {
-		boolean handled = gui.handleMouse(x, y, -1, true);
-		System.out.println(handled);
-		return handled;
+		if (mouseDown && !lastPressConsumed) {
+			ignoreMouse = true;
+			gui.clearMouseState();
+			return false;
+		}
+		return gui.handleMouse(x, y, -1, true);
 	}
 
 	public void dispose () {
@@ -281,15 +295,14 @@ public class TWL implements InputProcessor {
 			return Event.KEY_SPACE;
 		case Keys.KEYCODE_TAB:
 			return Event.KEY_TAB;
-		default:
-			return Event.KEY_NONE;
 		}
+		return Event.KEY_NONE;
 	}
 
 	/**
 	 * Returns a URL to a theme file, which can be used with
 	 * {@link ThemeManager#createThemeManager(URL, de.matthiasmann.twl.renderer.Renderer) ThemeManager} to create a theme for
-	 * {@link GUI#applyTheme(ThemeManager)}. This is only needed if not using the TWL class make use of TWL.
+	 * {@link GUI#applyTheme(ThemeManager)}. This is only needed if not using the {@link TWL} class to make use of TWL.
 	 */
 	static public URL getThemeURL (String themeFile, final FileType fileType) throws MalformedURLException {
 		File file = new File(themeFile);
diff --git a/gdx/src/com/badlogic/gdx/utils/ArrayPool.java b/gdx/src/com/badlogic/gdx/utils/ArrayPool.java
index 9d91a55ff..a6f5b60c7 100644
--- a/gdx/src/com/badlogic/gdx/utils/ArrayPool.java
+++ b/gdx/src/com/badlogic/gdx/utils/ArrayPool.java
@@ -35,7 +35,7 @@ import java.util.NoSuchElementException;
  * @author Nathan Sweet
  * @author Matthias Mann
  */
-abstract public class ArrayPool<T> {
+abstract public class ArrayPool<T> implements Iterable<T> {
 	public T[] items;
 	public int size;
 
diff --git a/gdx/src/com/badlogic/gdx/utils/Bag.java b/gdx/src/com/badlogic/gdx/utils/Bag.java
index 19f593c2a..800c71c0e 100644
--- a/gdx/src/com/badlogic/gdx/utils/Bag.java
+++ b/gdx/src/com/badlogic/gdx/utils/Bag.java
@@ -24,7 +24,7 @@ import java.util.NoSuchElementException;
  * @author Riven
  * @author Nathan Sweet
  */
-public class Bag<T> {
+public class Bag<T> implements Iterable<T> {
 	public T[] items;
 	public int size;
 
diff --git a/gdx/src/com/badlogic/gdx/utils/BagPool.java b/gdx/src/com/badlogic/gdx/utils/BagPool.java
index 905891184..b17a1b57d 100644
--- a/gdx/src/com/badlogic/gdx/utils/BagPool.java
+++ b/gdx/src/com/badlogic/gdx/utils/BagPool.java
@@ -24,7 +24,7 @@ import java.util.NoSuchElementException;
  * @author Riven
  * @author Nathan Sweet
  */
-abstract public class BagPool<T> {
+abstract public class BagPool<T> implements Iterable<T> {
 	public T[] items;
 	public int size;