len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 18:47:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resistor calculator: Don't assume a specific foreground colour

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28205 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2010-10-03 14:52:20 +00:00
parent 0f8fe94f46
commit ae75c6eb0a
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/plugins/resistor.c
View file

@ -39,12 +39,12 @@ TODO:
#else /* Small screens */ #else /* Small screens */
#define RESISTOR_BMP_Y 0 #define RESISTOR_BMP_Y 0
#endif /* HAVE_LCD_COLOR */ #endif
#else #else /* HAVE_LCD_COLOR */
#define USE_TEXT_ONLY #define USE_TEXT_ONLY
#endif #endif /* HAVE_LCD_COLOR */
#define total_resistance_str_x 1 #define total_resistance_str_x 1
#define tolerance_str_x 1 #define tolerance_str_x 1
@ -242,11 +242,15 @@ void draw_resistor(enum color firstband_color,
enum color thirdband_color, enum color thirdband_color,
enum color fourthband_color) enum color fourthband_color)
{ {
unsigned int fg;
rb->lcd_clear_display(); rb->lcd_clear_display();
display->set_viewport(&bitmap_vp); display->set_viewport(&bitmap_vp);
rb->lcd_bitmap_transparent(resistor, RESISTOR_BMP_X, 0, rb->lcd_bitmap_transparent(resistor, RESISTOR_BMP_X, 0,
BMPWIDTH_resistor, BMPHEIGHT_resistor); BMPWIDTH_resistor, BMPHEIGHT_resistor);
fg = rb->lcd_get_foreground();
if(firstband_color != RES_NONE) { if(firstband_color != RES_NONE) {
rb->lcd_set_foreground(band_data[firstband_color].color_value); rb->lcd_set_foreground(band_data[firstband_color].color_value);
rb->lcd_fillrect(first_band_x, universal_y, band_width, band_height); rb->lcd_fillrect(first_band_x, universal_y, band_width, band_height);
@ -279,7 +283,7 @@ void draw_resistor(enum color firstband_color,
rb->lcd_drawrect(fourth_band_x, universal_y, band_width, band_height); rb->lcd_drawrect(fourth_band_x, universal_y, band_width, band_height);
} }
rb->lcd_set_foreground(LCD_WHITE); rb->lcd_set_foreground(fg);
rb->lcd_update(); rb->lcd_update();
return; return;