# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1302483543 -10800
# Node ID 4b1989ff2ef73dedbe43f36d102b68932934942b
# Parent  cd00a5775373dc299d2be5c2996fc0beefe6563f
foo

diff -r cd00a5775373 -r 4b1989ff2ef7 src/imtk.c
--- a/src/imtk.c	Thu Mar 31 04:38:16 2011 +0300
+++ b/src/imtk.c	Mon Apr 11 03:59:03 2011 +0300
@@ -489,31 +489,27 @@
 {
 	int strsz = string_size(text);
 
+
 	if(hit_test(x, y, TEXTBOX_SIZE, 20)) {
-		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 + TEXTBOX_SIZE, y);
-	glVertex2f(x + TEXTBOX_SIZE, y + 20);
-	glVertex2f(x, y + 20);
-	glEnd();
-
-	glColor3fv(colors[IMTK_TEXT_COLOR]);
+	imtk_draw_rect(x, y, TEXTBOX_SIZE, 20, 3);
 
 	if(input == id) {
 		glBegin(GL_LINES);
+		glColor4f(1, 0, 0, colors[IMTK_TEXT_COLOR][3]);
 		glVertex2f(x + strsz + 2, y + 2);
 		glVertex2f(x + strsz + 2, y + 18);
+		glVertex2f(x + strsz + 3, y + 2);
+		glVertex2f(x + strsz + 3, y + 18);
 		glEnd();
 	}
 
+	glColor4fv(colors[IMTK_TEXT_COLOR]);
 	draw_string(x + 2, y + 15, text);
-
-	draw_frame(x, y, TEXTBOX_SIZE, 20, FRAME_INSET);
 }
 
 static void draw_slider(int id, float pos, float min, float max, int x, int y)
@@ -526,33 +522,21 @@
 	thumb_y = y - THUMB_HEIGHT / 2;
 
 	/* draw trough */
-	glBegin(GL_QUADS);
-	glColor3fv(colors[IMTK_BASE_COLOR]);
-	glVertex2f(x, y - 2);
-	glVertex2f(x + SLIDER_SIZE, y - 2);
-	glVertex2f(x + SLIDER_SIZE, y + 2);
-	glVertex2f(x, y + 2);
-	glEnd();
-	draw_frame(x, y - 2, SLIDER_SIZE, 4, FRAME_INSET);
+	imtk_draw_backgroundv(colors[IMTK_BASE_COLOR]);
+	imtk_draw_rect(x, y - 2, SLIDER_SIZE, 4, 3);
 
 	if(hit_test(thumb_x, thumb_y, THUMB_WIDTH, THUMB_HEIGHT)) {
-		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]);
 	}
 
 	/* draw handle */
-	glBegin(GL_QUADS);
-	glVertex2f(thumb_x, thumb_y);
-	glVertex2f(thumb_x + THUMB_WIDTH, thumb_y);
-	glVertex2f(thumb_x + THUMB_WIDTH, thumb_y + THUMB_HEIGHT);
-	glVertex2f(thumb_x, thumb_y + THUMB_HEIGHT);
-	glEnd();
-	draw_frame(thumb_x, thumb_y, THUMB_WIDTH, THUMB_HEIGHT, FRAME_OUTSET);
+	imtk_draw_rect(thumb_x, thumb_y, THUMB_WIDTH, THUMB_HEIGHT, 5);
 
 	/* draw display */
 	sprintf(buf, "%.3f", pos * range + min);
-	glColor3fv(colors[IMTK_TEXT_COLOR]);
+	glColor4fv(colors[IMTK_TEXT_COLOR]);
 	draw_string(x + SLIDER_SIZE + THUMB_WIDTH / 2 + 2, y + 4, buf);
 }
 
@@ -564,25 +548,15 @@
 	if(pos > 1.0) pos = 1.0;
 
 	/* through */
-	glBegin(GL_QUADS);
-	glColor3fv(colors[IMTK_BASE_COLOR]);
-	glVertex2f(x - 1, y - 1);
-	glVertex2f(x + SLIDER_SIZE + 1, y - 1);
-	glVertex2f(x + SLIDER_SIZE + 1, y + 17);
-	glVertex2f(x - 1, y + 17);
-	glEnd();
-	draw_frame(x - 1, y - 1, SLIDER_SIZE + 2, 17, FRAME_INSET);
+	imtk_draw_backgroundv(colors[IMTK_BASE_COLOR]);
+	imtk_draw_rect(x, y, SLIDER_SIZE, 15, 8);
 
 	if(pos > 0.0) {
 		/* bar */
-		glBegin(GL_QUADS);
-		glColor3fv(colors[IMTK_BASE_COLOR]);
-		glVertex2f(x, y);
-		glVertex2f(x + bar_size, y);
-		glVertex2f(x + bar_size, y + 15);
-		glVertex2f(x, y + 15);
-		glEnd();
-		draw_frame(x, y, bar_size, 15, FRAME_OUTSET);
+		imtk_draw_color(0, 0, 0, 0);
+		imtk_draw_background(0.2, 0.4, 1.0, colors[IMTK_BASE_COLOR][3]);
+		imtk_draw_rect(x, y, bar_size, 15, 8);
+		imtk_draw_colorv(colors[IMTK_FRAME_COLOR]);
 	}
 }