major changes to Watch window

flixel/system/debug/watch/EditableTextField.hx

@@ -1,7 +1,8 @@
 package flixel.system.debug.watch;
 
 import flixel.math.FlxMath;
-import flixel.util.FlxDestroyUtil.IFlxDestroyable;
+import flixel.util.FlxDestroyUtil;
+import flixel.util.FlxColor;
 import openfl.events.FocusEvent;
 import openfl.events.KeyboardEvent;
 import openfl.events.MouseEvent;
@@ -11,6 +12,8 @@ import openfl.text.TextFormat;
 import openfl.ui.Keyboard;
 import Type.ValueType;
 
+using StringTools;
+
 class EditableTextField extends TextField implements IFlxDestroyable
 {
 	public var isEditing(default, null):Bool;
@@ -142,10 +145,11 @@ class EditableTextField extends TextField implements IFlxDestroyable
 	{
 		var value:Dynamic = switch (expectedType)
 		{
-			#if neko
+			// #if neko
+			case TInt if (text.startsWith("#") || text.startsWith("0x")): FlxColor.fromString(text);
 			case TInt: Std.parseInt(text);
 			case TFloat: Std.parseFloat(text);
-			#end
+			// #end
 			case TBool if (text == "true"): true;
 			case TBool if (text == "false"): false;
 			case TEnum(e):

flixel/system/debug/watch/Watch.hx

@@ -1,9 +1,13 @@
 package flixel.system.debug.watch;
 
+import openfl.display.DisplayObject;
 import flixel.FlxG;
 import flixel.math.FlxPoint;
 import flixel.system.debug.FlxDebugger.GraphicWatch;
 import openfl.display.Sprite;
+import openfl.events.Event;
+import openfl.events.MouseEvent;
+import openfl.geom.Rectangle;
 
 using flixel.util.FlxStringUtil;
 using flixel.util.FlxArrayUtil;
@@ -12,32 +16,47 @@ using flixel.util.FlxArrayUtil;
  * A Visual Studio-style "watch" window, for use in the debugger overlay.
  * Track the values of any public variable in real-time, and/or edit their values on the fly.
  */
-class Watch extends Window
+class Watch extends WatchBase<WatchEntry>
 {
 	#if FLX_DEBUG
-	static inline var LINE_HEIGHT:Int = 15;
-
-	var entriesContainer:Sprite;
-	var entriesContainerOffset:FlxPoint = FlxPoint.get(2, 15);
-	var entries:Array<WatchEntry> = [];
-
-	public function new(closable:Bool = false)
+	public function new(closable = false)
 	{
-		super("Watch", new GraphicWatch(0, 0), 0, 0, true, null, closable);
+		super(WatchEntry.new, "Watch", new GraphicWatch(0, 0), true, null, closable);
+	}
+	#end
+}
 
-		entriesContainer = new Sprite();
-		entriesContainer.x = entriesContainerOffset.x;
-		entriesContainer.y = entriesContainerOffset.y;
+class WatchBase<TEntry:WatchEntry> extends Window
+{
+	#if FLX_DEBUG
+	static inline var LINE_HEIGHT:Int = 15;
+
+	public var alwaysOnTop(get, set):Bool;
+	inline function get_alwaysOnTop() return _alwaysOnTop;
+	inline function set_alwaysOnTop(value:Bool) return _alwaysOnTop = value;
+
+	final entriesContainer:ScrollSprite;
+	final entries:Array<TEntry> = [];
+	var create:(displayName:String, data:WatchEntryData)->TEntry;
+
+	public function new(entryConstructor, title, ?icon, resizable = true, ?bounds, closable = false, alwaysOnTop = true)
+	{
+		create = entryConstructor;
+		super(title, icon, 0, 0, resizable, bounds, closable, alwaysOnTop);
+
+		entriesContainer = new ScrollSprite();
+		entriesContainer.x = 2;
+		entriesContainer.y = 15;
 		addChild(entriesContainer);
-
+		
 		FlxG.signals.preStateSwitch.add(clear);
 	}
-
+	
 	public function add(displayName:String, data:WatchEntryData):Void
 	{
 		if (isInvalid(displayName, data))
 			return;
-
+		
 		var existing = getExistingEntry(displayName, data);
 		if (existing != null)
 		{
@@ -67,7 +86,7 @@ class Watch extends Window
 		}
 	}
 
-	function getExistingEntry(displayName:String, data:WatchEntryData):WatchEntry
+	function getExistingEntry(displayName:String, data:WatchEntryData):TEntry
 	{
 		for (entry in entries)
 		{
@@ -82,22 +101,24 @@ class Watch extends Window
 		return null;
 	}
 
-	function addEntry(displayName:String, data:WatchEntryData):Void
+	function addEntry(displayName:String, data:WatchEntryData, redraw = true)
 	{
-		var entry = new WatchEntry(displayName, data, removeEntry);
+		final entry = create(displayName, data);
+		entry.onRemove.addOnce(removeEntry.bind(entry));
 		entries.push(entry);
 		entriesContainer.addChild(entry);
-		updateSize();
+		if (redraw)
+			updateSize();
 	}
 
 	public function remove(displayName:String, data:WatchEntryData):Void
 	{
-		var existing = getExistingEntry(displayName, data);
+		final existing = getExistingEntry(displayName, data);
 		if (existing != null)
 			removeEntry(existing);
 	}
 
-	function removeEntry(entry:WatchEntry):Void
+	function removeEntry(entry:TEntry)
 	{
 		entries.fastSplice(entry);
 		entriesContainer.removeChild(entry);
@@ -122,7 +143,6 @@ class Watch extends Window
 	public function removeAll():Void
 	{
 		clear();
-		updateSize();
 	}
 
 	override public function update():Void
@@ -133,19 +153,34 @@ class Watch extends Window
 
 	override function updateSize():Void
 	{
-		resetEntries();
-		minSize.setTo(getMaxMinWidth() + entriesContainerOffset.x, entriesContainer.height + entriesContainerOffset.y);
+		final oldMinSize = minSize.x;
 		super.updateSize();
-		reposition(x, y);
+		minSize.x = oldMinSize;
+
+		entriesContainer.setScrollSize(getMarginWidth(), getMarginHeight());
+		resetEntries();
 	}
-
+
+	function getMarginWidth()
+	{
+		return _width - entriesContainer.x - (_resizable ? 5 : 3);
+	}
+
+	function getMarginHeight()
+	{
+		return _height - entriesContainer.y - 3;
+	}
+
 	function resetEntries():Void
 	{
+		final width = getMarginWidth();
+		final sansNameWidth = Math.min(width * 0.8, getMaxMinWidth());
+		final nameWidth = Math.min(getMaxNameWidth(), width - sansNameWidth);
 		for (i in 0...entries.length)
 		{
-			var entry = entries[i];
+			final entry = entries[i];
 			entry.y = i * LINE_HEIGHT;
-			entry.updateSize(getMaxNameWidth(), _width);
+			entry.updateSize(nameWidth, width);
 		}
 	}
 
@@ -172,3 +207,59 @@ class Watch extends Window
 	}
 	#end
 }
+
+class ScrollSprite extends Sprite
+{
+	var scroll = new Rectangle();
+
+	public function new ()
+	{
+		super();
+
+		addEventListener(Event.ADDED_TO_STAGE, function (e)
+		{
+			final stage = this.stage;
+			stage.addEventListener(MouseEvent.MOUSE_WHEEL, onMouseScroll);
+			addEventListener(Event.REMOVED_FROM_STAGE, (_)->stage.removeEventListener(MouseEvent.MOUSE_WHEEL, onMouseScroll));
+		});
+	}
+
+	function onMouseScroll(e:MouseEvent)
+	{
+		FlxG.watch.addQuick("mouseX", mouseX);
+		FlxG.watch.addQuick("mouseY", mouseY);
+		FlxG.watch.addQuick("scroll", scroll);
+		if (mouseX > 0 && mouseX < scroll.width && mouseY - scroll.y > 0 && mouseY - scroll.y < scroll.height)
+		{
+			scroll.y -= e.delta;
+			updateScroll();
+		}
+	}
+
+	public function setScrollSize(width:Float, height:Float)
+	{
+		scroll.width = width;
+		scroll.height = height;
+		updateScroll();
+	}
+
+	function updateScroll()
+	{
+		scrollRect = null;
+
+		if (scroll.bottom > this.height)
+			scroll.y = height - scroll.height;
+
+		if (scroll.y < 0)
+			scroll.y = 0;
+
+		scrollRect = scroll;
+	}
+
+	override function addChild(child)
+	{
+		super.addChild(child);
+		updateScroll();
+		return child;
+	}
+}