libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update progress bar drawing.

Browse Source 
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@740 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong@gmail.com 2010-05-27 23:03:37 +00:00
parent 338f4aa904
commit 4314d9f096
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/rtgui/common/rtgui_theme.c
View File

@ -541,7 +541,7 @@ void rtgui_theme_draw_radiobutton(struct rtgui_radiobox* radiobox, rt_uint16_t i
item_rect.x1 += item * item_size; item_rect.x1 += item * item_size;
/* set the first text rect */ /* set the first text rect */
item_rect.x2 = item_rect.x1 + item_size; item_rect.x2 = item_rect.x1 + item_size - 1;
item_rect.y2 = item_rect.y1 + bord_size; item_rect.y2 = item_rect.y1 + bord_size;
/* draw radio */ /* draw radio */
@ -689,7 +689,7 @@ void rtgui_theme_draw_radiobox(struct rtgui_radiobox* radiobox)
item_rect.x1 -= bord_size + 3; item_rect.x1 -= bord_size + 3;
item_rect.x1 += item_size; item_rect.x1 += item_size;
item_rect.x2 += item_size; item_rect.x2 += (item_size - 1);
} }
} }
@ -788,7 +788,6 @@ void rtgui_theme_draw_slider(struct rtgui_slider* slider)
return; return;
} }
void rtgui_theme_draw_progressbar(struct rtgui_progressbar* bar) void rtgui_theme_draw_progressbar(struct rtgui_progressbar* bar)
{ {
/* draw progress bar */ /* draw progress bar */
@ -797,32 +796,21 @@ void rtgui_theme_draw_progressbar(struct rtgui_progressbar* bar)
int max = bar->range; int max = bar->range;
int pos = bar->position; int pos = bar->position;
int left; int left;
rtgui_color_t bc;
/* begin drawing */ /* begin drawing */
dc = rtgui_dc_begin_drawing(&(bar->parent)); dc = rtgui_dc_begin_drawing(&(bar->parent));
if (dc == RT_NULL) return; if (dc == RT_NULL) return;
bc = RTGUI_DC_BC(dc);
rtgui_widget_get_rect(&(bar->parent), &rect); rtgui_widget_get_rect(&(bar->parent), &rect);
/* fill button rect with background color */ /* fill button rect with background color */
bar->parent.gc.background = RTGUI_RGB(212, 208, 200); bar->parent.gc.background = RTGUI_RGB(212, 208, 200);
rtgui_dc_fill_rect(dc, &rect);
/* draw border */ /* draw border */
bar->parent.gc.foreground = RTGUI_RGB(128, 128, 128); rect.x2 --; rect.y2 --;
rtgui_dc_draw_hline(dc, rect.x1, rect.x2 - 1, rect.y1); rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_SUNKEN);
rtgui_dc_draw_vline(dc, rect.x1, rect.y1, rect.y2 - 1);
bar->parent.gc.foreground = RTGUI_RGB(64, 64, 64);
rtgui_dc_draw_hline(dc, rect.x1, rect.x2, rect.y1 + 1);
rtgui_dc_draw_vline(dc, rect.x1 + 1, rect.y1, rect.y2);
bar->parent.gc.foreground = RTGUI_RGB(212, 208, 200);
rtgui_dc_draw_hline(dc, rect.x1, rect.x2 + 1, rect.y2);
rtgui_dc_draw_vline(dc, rect.x2, rect.y1, rect.y2);
bar->parent.gc.foreground = RTGUI_RGB(255, 255, 255);
rtgui_dc_draw_hline(dc, rect.x1 + 1, rect.x2, rect.y2 - 1);
rtgui_dc_draw_vline(dc, rect.x2 - 1, rect.y1 + 1, rect.y2 - 1);
/* Nothing to draw */ /* Nothing to draw */
if (max == 0) if (max == 0)
@ -831,6 +819,7 @@ void rtgui_theme_draw_progressbar(struct rtgui_progressbar* bar)
return; return;
} }
rect.x2 ++; rect.y2 ++;
left = max - pos; left = max - pos;
rtgui_rect_inflate(&rect, -2); rtgui_rect_inflate(&rect, -2);
bar->parent.gc.background = RTGUI_RGB(0, 0, 255); bar->parent.gc.background = RTGUI_RGB(0, 0, 255);
@ -841,11 +830,20 @@ void rtgui_theme_draw_progressbar(struct rtgui_progressbar* bar)
int dy = (rtgui_rect_height(rect) * left) / max; int dy = (rtgui_rect_height(rect) * left) / max;
rect.y1 += dy; rect.y1 += dy;
rtgui_dc_fill_rect(dc, &rect); rtgui_dc_fill_rect(dc, &rect);
RTGUI_DC_BC(dc) = bc;
rect.y1 -= dy; rect.y2 = dy;
rtgui_dc_fill_rect(dc, &rect);
} }
else else
{ {
/* Horizontal bar grows from left to right */ /* Horizontal bar grows from left to right */
rect.x2 -= (rtgui_rect_width(rect) * left) / max; int dx = (rtgui_rect_width(rect) * left) / max;
rect.x2 -= dx;
rtgui_dc_fill_rect(dc, &rect);
RTGUI_DC_BC(dc) = bc;
rect.x1 = rect.x2; rect.x2 += dx;
rtgui_dc_fill_rect(dc, &rect); rtgui_dc_fill_rect(dc, &rect);
} }

1
components/rtgui/widgets/progressbar.c
View File

@ -77,7 +77,6 @@ void rtgui_progressbar_destroy(struct rtgui_progressbar* bar)
rtgui_widget_destroy(RTGUI_WIDGET(bar)); rtgui_widget_destroy(RTGUI_WIDGET(bar));
} }
void rtgui_progressbar_set_value(struct rtgui_progressbar *bar, int value) void rtgui_progressbar_set_value(struct rtgui_progressbar *bar, int value)
{ {
RT_ASSERT(bar != RT_NULL); RT_ASSERT(bar != RT_NULL);