From 4b4a5c335f53c8f81d03b161a3cc86efe7dab1d5 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 16 May 2016 17:07:30 -0400
Subject: [PATCH] Laid out the Windows color dialog.

---
 windows/colorbutton.cpp |  4 ++++
 windows/resources.hpp   | 26 ++++++++++++++++++++++++
 windows/resources.rc    | 44 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/windows/colorbutton.cpp b/windows/colorbutton.cpp
index 2c6313c8..dd82340f 100644
--- a/windows/colorbutton.cpp
+++ b/windows/colorbutton.cpp
@@ -22,6 +22,8 @@ static void uiColorButtonDestroy(uiControl *c)
 	uiFreeControl(uiControl(b));
 }
 
+static INT_PTR TODO(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){return uMsg == WM_INITDIALOG;}
+
 static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)
 {
 	uiColorButton *b = uiColorButton(c);
@@ -38,6 +40,8 @@ static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)
 	}
 */
 
+	DialogBox(hInstance, MAKEINTRESOURCE(rcColorDialog), GetAncestor(b->hwnd, GA_ROOT), TODO);
+
 	*lResult = 0;
 	return TRUE;
 }
diff --git a/windows/resources.hpp b/windows/resources.hpp
index 5bcbb3d9..96bd5cf8 100644
--- a/windows/resources.hpp
+++ b/windows/resources.hpp
@@ -2,8 +2,34 @@
 
 #define rcTabPageDialog 100
 #define rcFontDialog 101
+#define rcColorDialog 102
 
 #define rcFontFamilyCombobox 1000
 #define rcFontStyleCombobox 1001
 #define rcFontSizeCombobox 1002
 #define rcFontSamplePlacement 1003
+
+#define rcColorSVChooser 1100
+#define rcColorHSlider 1101
+#define rcPreview 1102
+#define rcOpacitySlider 1103
+#define rcH 1104
+#define rcS 1105
+#define rcV 1106
+#define rcRDouble 1107
+#define rcRInt 1108
+#define rcGDouble 1109
+#define rcGInt 1110
+#define rcBDouble 1111
+#define rcBInt 1112
+#define rcADouble 1113
+#define rcAInt 1114
+#define rcHex 1115
+#define rcHLabel 1116
+#define rcSLabel 1117
+#define rcVLabel 1118
+#define rcRLabel 1119
+#define rcGLabel 1120
+#define rcBLabel 1121
+#define rcALabel 1122
+#define rcHexLabel 1123
diff --git a/windows/resources.rc b/windows/resources.rc
index e5958dab..7029385b 100644
--- a/windows/resources.rc
+++ b/windows/resources.rc
@@ -47,3 +47,47 @@ BEGIN
 	DEFPUSHBUTTON	"OK", IDOK, 141, 181, 45, 14, WS_GROUP
 	PUSHBUTTON		"Cancel", IDCANCEL, 190, 181, 45, 14, WS_GROUP
 END
+
+rcColorDialog DIALOGEX 13, 54, 344, 209
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_3DLOOK
+CAPTION "Color"
+FONT 9, "Segoe UI"
+BEGIN
+	// this size should be big enough to get at least 256x256 on font sizes >= 8 pt
+	CTEXT		"AaBbYyZz", rcColorSVChooser, 7, 7, 195, 195, SS_NOPREFIX | SS_BLACKRECT
+
+	// width is the suggested slider height since this is vertical
+	CTEXT		"AaBbYyZz", rcColorHSlider, 206, 7, 15, 195, SS_NOPREFIX | SS_BLACKRECT
+
+	LTEXT		"Preview:", -1, 230, 7, 107, 9, SS_NOPREFIX
+	CTEXT		"AaBbYyZz", rcPreview, 230, 16, 107, 20, SS_NOPREFIX | SS_BLACKRECT
+
+	LTEXT		"Opacity:", -1, 230, 45, 107, 9, SS_NOPREFIX
+	CTEXT		"AaBbYyZz", rcOpacitySlider, 230, 54, 107, 15, SS_NOPREFIX | SS_BLACKRECT
+
+	LTEXT		"&H:", rcHLabel, 230, 81, 8, 8
+	EDITTEXT		rcH, 238, 78, 30, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	LTEXT		"&S:", rcSLabel, 230, 95, 8, 8
+	EDITTEXT		rcS, 238, 92, 30, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	LTEXT		"&V:", rcVLabel, 230, 109, 8, 8
+	EDITTEXT		rcV, 238, 106, 30, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+
+	LTEXT		"&R:", rcRLabel, 277, 81, 8, 8
+	EDITTEXT		rcRDouble, 285, 78, 30, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	EDITTEXT		rcRInt, 315, 78, 20, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	LTEXT		"&G:", rcGLabel, 277, 95, 8, 8
+	EDITTEXT		rcGDouble, 285, 92, 30, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	EDITTEXT		rcGInt, 315, 92, 20, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	LTEXT		"&B:", rcBLabel, 277, 109, 8, 8
+	EDITTEXT		rcBDouble, 285, 106, 30, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	EDITTEXT		rcBInt, 315, 106, 20, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	LTEXT		"&A:", rcALabel, 277, 123, 8, 8
+	EDITTEXT		rcADouble, 285, 120, 30, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+	EDITTEXT		rcAInt, 315, 120, 20, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+
+	LTEXT		"He&x:", rcHexLabel, 269, 146, 16, 8
+	EDITTEXT		rcHex, 285, 143, 50, 14, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE
+
+	DEFPUSHBUTTON	"OK", IDOK, 243, 188, 45, 14, WS_GROUP
+	PUSHBUTTON		"Cancel", IDCANCEL, 292, 188, 45, 14, WS_GROUP
+END