imtk
diff src/slider.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 | df2bc9406561 |
line diff
1.1 --- a/src/slider.c Thu Apr 14 23:04:07 2011 +0300 1.2 +++ b/src/slider.c Thu Apr 14 23:21:56 2011 +0300 1.3 @@ -73,13 +73,7 @@ 1.4 thumb_y = y - THUMB_HEIGHT / 2; 1.5 1.6 /* draw trough */ 1.7 - glBegin(GL_QUADS); 1.8 - glColor4fv(imtk_get_color(IMTK_BASE_COLOR)); 1.9 - glVertex2f(x, y - 2); 1.10 - glVertex2f(x + SLIDER_SIZE, y - 2); 1.11 - glVertex2f(x + SLIDER_SIZE, y + 2); 1.12 - glVertex2f(x, y + 2); 1.13 - glEnd(); 1.14 + imtk_draw_rect(x, y - 2, SLIDER_SIZE, 4, imtk_get_color(IMTK_BASE_COLOR)); 1.15 imtk_draw_frame(x, y - 2, SLIDER_SIZE, 4, FRAME_INSET); 1.16 1.17 if(imtk_hit_test(thumb_x, thumb_y, THUMB_WIDTH, THUMB_HEIGHT)) { 1.18 @@ -89,12 +83,7 @@ 1.19 } 1.20 1.21 /* draw handle */ 1.22 - glBegin(GL_QUADS); 1.23 - glVertex2f(thumb_x, thumb_y); 1.24 - glVertex2f(thumb_x + THUMB_WIDTH, thumb_y); 1.25 - glVertex2f(thumb_x + THUMB_WIDTH, thumb_y + THUMB_HEIGHT); 1.26 - glVertex2f(thumb_x, thumb_y + THUMB_HEIGHT); 1.27 - glEnd(); 1.28 + imtk_draw_rect(thumb_x, thumb_y, THUMB_WIDTH, THUMB_HEIGHT, 0); 1.29 imtk_draw_frame(thumb_x, thumb_y, THUMB_WIDTH, THUMB_HEIGHT, FRAME_OUTSET); 1.30 1.31 /* draw display */