From 132013463e0c3d134bc46b50c4f053b46758aa4b Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Wed, 14 Feb 2018 09:58:53 -0500
Subject: [PATCH] new features from plane

---
 joystick.d |  3 +++
 minigui.d  | 46 +++++++++++++++++++++++++++++++++++++++-------
 terminal.d |  2 ++
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/joystick.d b/joystick.d
index df223e3..27c4a09 100644
--- a/joystick.d
+++ b/joystick.d
@@ -1,4 +1,7 @@
 /**
+
+	FIXME: a simple function to integrate with sdpy event loop. templated function
+
 	HIGH LEVEL NOTES
 
 	This will offer a pollable state of two styles of controller: a PS1 or an XBox 360.
diff --git a/minigui.d b/minigui.d
index b67e61e..89207b6 100644
--- a/minigui.d
+++ b/minigui.d
@@ -8,8 +8,7 @@
 /*
 	TODO:
 
-	class Form with submit behavior
-	class CommandButton with a consistent size
+	class Form with submit behavior -- see AutomaticDialog
 
 	disabled widgets and menu items
 
@@ -3811,7 +3810,11 @@ class MainWindow : Window {
 
 	override void addChild(Widget c, int position = int.max) {
 		if(auto tb = cast(ToolBar) c)
-			super.addChild(c, menuBar ? 1 : 0);
+			version(win32_widgets)
+				super.addChild(c, 0);
+			else version(custom_widgets)
+				super.addChild(c, menuBar ? 1 : 0);
+			else static assert(0);
 		else
 			clientArea.addChild(c, position);
 	}
@@ -5026,6 +5029,28 @@ class Button : MouseActivatedWidget {
 
 }
 
+/++
+	A button with a consistent size, suitable for user commands like OK and Cancel.
++/
+class CommandButton : Button {
+	this(string label, Widget parent = null) {
+		super(label, parent);
+	}
+
+	override int maxHeight() {
+		return Window.lineHeight + 4;
+	}
+
+	override int maxWidth() {
+		return Window.lineHeight * 4;
+	}
+
+	override int marginLeft() { return 12; }
+	override int marginRight() { return 12; }
+	override int marginTop() { return 12; }
+	override int marginBottom() { return 12; }
+}
+
 ///
 enum ArrowDirection {
 	left, ///
@@ -6424,18 +6449,24 @@ class AutomaticDialog(T) : Dialog {
 	void delegate(T) onOK;
 	void delegate() onCancel;
 
+	override int paddingTop() { return Window.lineHeight; }
+	override int paddingBottom() { return Window.lineHeight; }
+	override int paddingRight() { return Window.lineHeight; }
+	override int paddingLeft() { return Window.lineHeight; }
+
 	this(void delegate(T) onOK, void delegate() onCancel) {
 		static if(is(T == class))
 			t = new T();
 		this.onOK = onOK;
 		this.onCancel = onCancel;
-		super(400, 300, T.stringof);
+		super(400, (__traits(allMembers, T).length + 5) * Window.lineHeight, T.stringof);
 
 		foreach(memberName; __traits(allMembers, T)) {
 			alias member = I!(__traits(getMember, t, memberName))[0];
 			alias type = typeof(member);
 			static if(is(type == string)) {
-				auto le = new LabeledLineEdit(memberName ~ ": ", this);
+				import std.string;
+				auto le = new LabeledLineEdit(memberName.capitalize ~ ": ", this);
 				le.addEventListener(EventType.change, (Event ev) {
 					__traits(getMember, t, memberName) = ev.stringValue;
 				});
@@ -6457,8 +6488,9 @@ class AutomaticDialog(T) : Dialog {
 		}
 
 		auto hl = new HorizontalLayout(this);
-		auto ok = new Button("OK", hl);
-		auto cancel = new Button("Cancel", hl);
+		auto stretch = new HorizontalSpacer(hl); // to right align
+		auto ok = new CommandButton("OK", hl);
+		auto cancel = new CommandButton("Cancel", hl);
 		ok.addEventListener(EventType.triggered, &OK);
 		cancel.addEventListener(EventType.triggered, &Cancel);
 
diff --git a/terminal.d b/terminal.d
index 606b093..702bced 100644
--- a/terminal.d
+++ b/terminal.d
@@ -1,3 +1,5 @@
+// FIXME: have a simple function that integrates with sdpy event loop. it can be a template
+// for optional dependency
 /++
 	Module for interacting with the user's terminal, including color output, cursor manipulation, and full-featured real-time mouse and keyboard input. Also includes high-level convenience methods, like [Terminal.getline], which gives the user a line editor with history, completion, etc. See the [#examples].