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>
This commit is contained in:
Tim Blechmann 2011-04-02 14:44:11 +02:00 committed by Takashi Iwai
parent 210cb5f447
commit c975369874
4 changed files with 5 additions and 5 deletions

View file

@ -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);
}

View file

@ -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--;) {

View file

@ -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--;) {

View file

@ -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() {