imtk

diff src/progress.c @ 8:10604ff95527

imtk_draw_rect
author John Tsiombikas <nuclear@member.fsf.org>
date Thu, 14 Apr 2011 23:21:56 +0300
parents 6d35e6c7b2ca
children 9c7987064bb0
line diff
     1.1 --- a/src/progress.c	Thu Apr 14 23:04:07 2011 +0300
     1.2 +++ b/src/progress.c	Thu Apr 14 23:21:56 2011 +0300
     1.3 @@ -18,24 +18,12 @@
     1.4  	if(pos > 1.0) pos = 1.0;
     1.5  
     1.6  	/* through */
     1.7 -	glBegin(GL_QUADS);
     1.8 -	glColor4fv(imtk_get_color(IMTK_BASE_COLOR));
     1.9 -	glVertex2f(x - 1, y - 1);
    1.10 -	glVertex2f(x + SLIDER_SIZE + 1, y - 1);
    1.11 -	glVertex2f(x + SLIDER_SIZE + 1, y + 17);
    1.12 -	glVertex2f(x - 1, y + 17);
    1.13 -	glEnd();
    1.14 +	imtk_draw_rect(x - 1, y - 1, SLIDER_SIZE + 1, 18, imtk_get_color(IMTK_BASE_COLOR));
    1.15  	imtk_draw_frame(x - 1, y - 1, SLIDER_SIZE + 2, 17, FRAME_INSET);
    1.16  
    1.17  	if(pos > 0.0) {
    1.18  		/* bar */
    1.19 -		glBegin(GL_QUADS);
    1.20 -		glColor4fv(imtk_get_color(IMTK_BASE_COLOR));
    1.21 -		glVertex2f(x, y);
    1.22 -		glVertex2f(x + bar_size, y);
    1.23 -		glVertex2f(x + bar_size, y + 15);
    1.24 -		glVertex2f(x, y + 15);
    1.25 -		glEnd();
    1.26 +		imtk_draw_rect(x, y, bar_size, 15, imtk_get_color(IMTK_BASE_COLOR));
    1.27  		imtk_draw_frame(x, y, bar_size, 15, FRAME_OUTSET);
    1.28  	}
    1.29  }