# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1301535496 -10800
# Node ID cd00a5775373dc299d2be5c2996fc0beefe6563f
# Parent  a115dff39a540e56eb0d6b86b5cae40e94f8763b
beautified the checkbox

diff -r a115dff39a54 -r cd00a5775373 src/imtk.c
--- a/src/imtk.c	Fri Mar 11 02:25:49 2011 +0200
+++ b/src/imtk.c	Thu Mar 31 04:38:16 2011 +0300
@@ -18,6 +18,9 @@
 #define THUMB_WIDTH		10
 #define THUMB_HEIGHT	20
 
+#define IMTK_BEVEL_SHAD_COLOR	3
+#define IMTK_BEVEL_LIT_COLOR	3
+
 enum {
 	FRAME_OUTSET,
 	FRAME_INSET
@@ -47,9 +50,8 @@
 static float colors[][4] = {
 	{0.0, 0.0, 0.0, 0.7},		/* text color */
 	{0.6, 0.6, 0.6, 0.7},		/* base color */
-	{0.7, 0.7, 0.7, 0.7},	/* focus color */
-	{1.0, 1.0, 1.0, 1.0},		/* lit bevel */
-	{0.3, 0.3, 0.3, 1.0}		/* shadowed bevel */
+	{0.7, 0.7, 0.7, 0.7},		/* focus color */
+	{0.0, 0.0, 0.0, 0.7}		/* frame color */
 };
 
 static int scr_width = 1, scr_height = 1;
@@ -410,28 +412,12 @@
 
 	calc_button_size(label, &width, &height);
 
-	/*
-	glBegin(GL_QUADS);
-	if(hit_test(x, y, width, height)) {
-		glColor3fv(colors[IMTK_FOCUS_COLOR]);
-	} else {
-		glColor3fv(colors[IMTK_BASE_COLOR]);
-	}
-	glVertex2f(x, y);
-	glVertex2f(x + width, y);
-	glVertex2f(x + width, y + height);
-	glVertex2f(x, y + height);
-	glEnd();
-
-	draw_frame(x, y, width, height, active == id ? FRAME_INSET : FRAME_OUTSET);
-	*/
-
 	if(hit_test(x, y, width, height)) {
 		imtk_draw_backgroundv(colors[IMTK_FOCUS_COLOR]);
 	} else {
 		imtk_draw_backgroundv(colors[IMTK_BASE_COLOR]);
 	}
-	imtk_draw_rect(x, y, width, height, 8);
+	imtk_draw_rect(x, y, width, height, 6);
 
 	glColor3fv(colors[IMTK_TEXT_COLOR]);
 	draw_string(x + 20, y + 15, label);
@@ -447,37 +433,55 @@
 static void draw_checkbox(int id, const char *label, int x, int y, int state)
 {
 	static const int sz = CHECKBOX_SIZE;
+	static float v[][2] = {
+		{-0.2, 0.63},	/* 0 */
+		{0.121, 0.325},	/* 1 */
+		{0.15, 0.5},	/* 2 */
+		{0.28, 0.125},	/* 3 */
+		{0.38, 0.33},	/* 4 */
+		{0.42, -0.122},	/* 5 */
+		{0.58, 0.25},	/* 6 */
+		{0.72, 0.52},	/* 7 */
+		{0.625, 0.65},	/* 8 */
+		{0.89, 0.78},	/* 9 */
+		{0.875, 0.92},	/* 10 */
+		{1.13, 1.145}	/* 11 */
+	};
+#define TRI(a, b, c)	(glVertex2fv(v[a]), glVertex2fv(v[b]), glVertex2fv(v[c]))
+
 
 	if(hit_test(x, y, sz, sz)) {
-		glColor3fv(colors[IMTK_FOCUS_COLOR]);
+		imtk_draw_backgroundv(colors[IMTK_FOCUS_COLOR]);
 	} else {
-		glColor3fv(colors[IMTK_BASE_COLOR]);
+		imtk_draw_backgroundv(colors[IMTK_BASE_COLOR]);
 	}
 
-	glBegin(GL_QUADS);
-	glVertex2f(x, y);
-	glVertex2f(x + sz, y);
-	glVertex2f(x + sz, y + sz);
-	glVertex2f(x, y + sz);
-	glEnd();
+	imtk_draw_rect(x, y, sz, sz, 3);
 
-	draw_frame(x, y, sz, sz, FRAME_INSET);
+	if(state) {
+		glMatrixMode(GL_MODELVIEW);
+		glPushMatrix();
+		glTranslatef(x, y + sz, 0);
+		glScalef(sz * 1.2, -sz * 1.3, 1);
 
-	glColor3fv(colors[IMTK_TEXT_COLOR]);
-	if(state) {
-		glPushAttrib(GL_LINE_BIT);
-		glLineWidth(2);
-
-		glBegin(GL_LINES);
-		glVertex2f(x + 2, y + 2);
-		glVertex2f(x + sz - 2, y + sz - 2);
-		glVertex2f(x + sz - 2, y + 2);
-		glVertex2f(x + 2, y + sz - 2);
+		glBegin(GL_TRIANGLES);
+		glColor4f(0.63, 0.078, 0.078, colors[IMTK_TEXT_COLOR][3]);
+		TRI(0, 1, 2);
+		TRI(1, 3, 2);
+		TRI(3, 4, 2);
+		TRI(3, 5, 4);
+		TRI(4, 5, 6);
+		TRI(4, 6, 7);
+		TRI(4, 7, 8);
+		TRI(8, 7, 9);
+		TRI(8, 9, 10);
+		TRI(10, 9, 11);
 		glEnd();
 
-		glPopAttrib();
+		glPopMatrix();
 	}
 
+	glColor4fv(colors[IMTK_TEXT_COLOR]);
 	draw_string(x + sz + 5, y + sz - 2, label);
 }
 
diff -r a115dff39a54 -r cd00a5775373 src/imtk.h
--- a/src/imtk.h	Fri Mar 11 02:25:49 2011 +0200
+++ b/src/imtk.h	Thu Mar 31 04:38:16 2011 +0300
@@ -8,8 +8,7 @@
 	IMTK_TEXT_COLOR,
 	IMTK_BASE_COLOR,
 	IMTK_FOCUS_COLOR,
-	IMTK_BEVEL_LIT_COLOR,
-	IMTK_BEVEL_SHAD_COLOR
+	IMTK_FRAME_COLOR
 };
 
 /* key/button state enum */
diff -r a115dff39a54 -r cd00a5775373 test.c
--- a/test.c	Fri Mar 11 02:25:49 2011 +0200
+++ b/test.c	Thu Mar 31 04:38:16 2011 +0300
@@ -118,7 +118,7 @@
 
 void gui(void)
 {
-	static int bnshow;
+	static int bnshow = 1;
 	static char textbuf[256];
 	static char textbuf2[256];
 	static float val;