Resistor calculator: Don't assume a specific foreground colour

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28205 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 8 insertions, 4 deletions

diff --git a/apps/plugins/resistor.c b/apps/plugins/resistor.c
index d2645a792e..006a2c94d1 100644
--- a/apps/plugins/resistor.c
+++ b/apps/plugins/resistor.c
@@ -39,12 +39,12 @@ TODO:
 #else /* Small screens */
 #define RESISTOR_BMP_Y             0
 
-#endif /* HAVE_LCD_COLOR */
+#endif
 
-#else
+#else /* HAVE_LCD_COLOR */
 
 #define    USE_TEXT_ONLY
-#endif
+#endif /* HAVE_LCD_COLOR */
 
 #define total_resistance_str_x     1
 #define tolerance_str_x            1
@@ -242,10 +242,14 @@ void draw_resistor(enum color firstband_color,
                    enum color thirdband_color,
                    enum color fourthband_color)
 {
+    unsigned int fg;
+
     rb->lcd_clear_display();
     display->set_viewport(&bitmap_vp);
     rb->lcd_bitmap_transparent(resistor, RESISTOR_BMP_X, 0, 
                                BMPWIDTH_resistor, BMPHEIGHT_resistor);
+
+    fg = rb->lcd_get_foreground();
         
     if(firstband_color != RES_NONE) {
         rb->lcd_set_foreground(band_data[firstband_color].color_value);
@@ -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_set_foreground(LCD_WHITE);
+    rb->lcd_set_foreground(fg);
             
     rb->lcd_update();
     return;