hdspmixer: fix drawing problems with black background

- use foreground color instead of black
- HDSPMixerSelector: set colors before setting labels

Signed-off-by: Tim Blechmann <tim@klingt.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/hdspmixer/src/HDSPMixerAboutText.cxx b/hdspmixer/src/HDSPMixerAboutText.cxx
index c8c9b1a11078cc7787951a1fc37b686709a2976a..6227b1146367f5f21d7e30f0c3db001acb6b1a46 100644 (file)
--- a/hdspmixer/src/HDSPMixerAboutText.cxx
+++ b/hdspmixer/src/HDSPMixerAboutText.cxx
@@ -48,7 +48,7 @@ HDSPMixerAboutText::HDSPMixerAboutText(int x, int y, int w, int h):Fl_Widget(x,
 
 void HDSPMixerAboutText::draw()
 {
-       fl_color(FL_BLACK);
+       fl_color(FL_FOREGROUND_COLOR);
        fl_font(FL_HELVETICA, 10);
        fl_draw(text, x(), y(), w(), h(), FL_ALIGN_LEFT);
 }

diff --git a/hdspmixer/src/HDSPMixerIOMixer.cxx b/hdspmixer/src/HDSPMixerIOMixer.cxx
index 987be41733f585bbecbc95eb11e6f926abdb3590..7e3934e4bbd9b343087ed08ecb5c86fa4f626a46 100644 (file)
--- a/hdspmixer/src/HDSPMixerIOMixer.cxx
+++ b/hdspmixer/src/HDSPMixerIOMixer.cxx
@@ -71,7 +71,7 @@ void HDSPMixerIOMixer::draw()
     Fl_Widget *const* a = array();
     if (damage() & ~FL_DAMAGE_CHILD) {
        draw_background();
-       fl_color(FL_BLACK);
+       fl_color(FL_FOREGROUND_COLOR);
        fl_font(FL_HELVETICA, 8);
        fl_draw(channel_name.str().c_str(), x()+4, y()+225, 27, 9, FL_ALIGN_CENTER);
        for (int i=children(); i--;) {

diff --git a/hdspmixer/src/HDSPMixerOutput.cxx b/hdspmixer/src/HDSPMixerOutput.cxx
index 50478256f052d8e9996e727c5a62bdf79ab6f936..2c7fe293d32c83aa4eb2473e8556ca7b9133c583 100644 (file)
--- a/hdspmixer/src/HDSPMixerOutput.cxx
+++ b/hdspmixer/src/HDSPMixerOutput.cxx
@@ -303,7 +303,7 @@ void HDSPMixerOutput::draw()
     Fl_Widget*const* a = array();
     if (damage() & ~FL_DAMAGE_CHILD) {
        draw_background();
-       fl_color(FL_BLACK);
+       fl_color(FL_FOREGROUND_COLOR);
        fl_font(FL_HELVETICA, 8);
        fl_draw(labels_playback[out_num], x()+4, y()+193, 27, 9, FL_ALIGN_CENTER);
        for (int i=children(); i--;) {

diff --git a/hdspmixer/src/HDSPMixerSelector.cxx b/hdspmixer/src/HDSPMixerSelector.cxx
index 098658fe1c2a28b6e7f4d07c0c28459ee1621327..32d91dbfa14df8cb0cc11178b3cd5dd1eba77e7f 100644 (file)
--- a/hdspmixer/src/HDSPMixerSelector.cxx
+++ b/hdspmixer/src/HDSPMixerSelector.cxx
@@ -164,10 +164,10 @@ HDSPMixerSelector::HDSPMixerSelector(int x, int y, int w, int h):Fl_Menu_(x, y,
     max_dest = 0;
     selected = 0;
     basew = (HDSPMixerWindow *)window();
-    setLabels();
     textfont(FL_HELVETICA);
     textsize(8);
-    textcolor(FL_BLACK);
+    textcolor(FL_FOREGROUND_COLOR);
+    setLabels();
 }
 
 void HDSPMixerSelector::draw() {