diff --git a/ChangeLog b/ChangeLog index 531a6457..1c97f945 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17480,3 +17480,5 @@ 2018-08-17 Fred Gleason * Fixed problems with dragged carts setting the correct color when dropped on a sound panel button. +2018-08-17 Fred Gleason + * Fixed the incorrect background color in the meters in rdcatch(1). diff --git a/lib/rdplaymeter.cpp b/lib/rdplaymeter.cpp index 7c5dab11..dc16357e 100644 --- a/lib/rdplaymeter.cpp +++ b/lib/rdplaymeter.cpp @@ -3,7 +3,7 @@ // This implements a widget that represents a stereo audio level meter, // complete with labels and scale. // -// (C) Copyright 2002-2016 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,29 +19,21 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include +#include + +#include #include #include -#include #include -#include -#include -//Added by qt3to4: -#include -#include -#include -#include -#include -#include +#include +#include -#include +#include "rdplaymeter.h" RDPlayMeter::RDPlayMeter(RDSegMeter::Orientation orient,QWidget *parent) : QWidget(parent) { meter_label=QString(""); - setBackgroundColor(Qt::black); orientation=orient; makeFont(); meter=new RDSegMeter(orientation,this); @@ -218,22 +210,26 @@ void RDPlayMeter::paintEvent(QPaintEvent *paintEvent) // Setup // QPainter *p=new QPainter(this); + p->fillRect(0,0,width(),height(),Qt::black); p->setFont(label_font); p->setPen(Qt::white); if(!meter_label.isEmpty()) { switch(orientation) { - case RDSegMeter::Left: - p->drawText(width()-height()+meter_label_x,height()-2,meter_label); - break; - case RDSegMeter::Right: - p->drawText(meter_label_x,height()-2,meter_label); - break; - case RDSegMeter::Up: - p->drawText(meter_label_x,height()-3,meter_label); - break; - case RDSegMeter::Down: - p->drawText(meter_label_x,width()-1,meter_label); - break; + case RDSegMeter::Left: + p->drawText(width()-height()+meter_label_x,height()-2,meter_label); + break; + + case RDSegMeter::Right: + p->drawText(meter_label_x,height()-2,meter_label); + break; + + case RDSegMeter::Up: + p->drawText(meter_label_x,height()-3,meter_label); + break; + + case RDSegMeter::Down: + p->drawText(meter_label_x,width()-1,meter_label); + break; } } p->end(); @@ -244,29 +240,28 @@ void RDPlayMeter::paintEvent(QPaintEvent *paintEvent) void RDPlayMeter::makeFont() { switch(orientation) { - case RDSegMeter::Left: - label_font=QFont("helvetica",height()-2,QFont::Bold); - label_font.setPixelSize(height()-2); - meter_label_x=(height()-QFontMetrics(label_font). - width(meter_label))/2; - break; - case RDSegMeter::Right: - label_font=QFont("helvetica",height()-2,QFont::Bold); - label_font.setPixelSize(height()-2); - meter_label_x=(height()-QFontMetrics(label_font). - width(meter_label))/2; - break; - case RDSegMeter::Up: - label_font=QFont("helvetica",width()-2,QFont::Bold); - label_font.setPixelSize(width()-2); - meter_label_x=(width()-QFontMetrics(label_font). - width(meter_label))/2; - break; - case RDSegMeter::Down: - label_font=QFont("helvetica",width()-2,QFont::Bold); - label_font.setPixelSize(width()-2); - meter_label_x=(width()-QFontMetrics(label_font). - width(meter_label))/2; - break; + case RDSegMeter::Left: + label_font=QFont("helvetica",height()-2,QFont::Bold); + label_font.setPixelSize(height()-2); + meter_label_x=(height()-QFontMetrics(label_font).width(meter_label))/2; + break; + + case RDSegMeter::Right: + label_font=QFont("helvetica",height()-2,QFont::Bold); + label_font.setPixelSize(height()-2); + meter_label_x=(height()-QFontMetrics(label_font).width(meter_label))/2; + break; + + case RDSegMeter::Up: + label_font=QFont("helvetica",width()-2,QFont::Bold); + label_font.setPixelSize(width()-2); + meter_label_x=(width()-QFontMetrics(label_font).width(meter_label))/2; + break; + + case RDSegMeter::Down: + label_font=QFont("helvetica",width()-2,QFont::Bold); + label_font.setPixelSize(width()-2); + meter_label_x=(width()-QFontMetrics(label_font).width(meter_label))/2; + break; } } diff --git a/lib/rdplaymeter.h b/lib/rdplaymeter.h index a0cb72f8..aafb6a4c 100644 --- a/lib/rdplaymeter.h +++ b/lib/rdplaymeter.h @@ -2,7 +2,7 @@ // // A playback audio meter widget. // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -21,20 +21,16 @@ #ifndef RDPLAYMETER_H #define RDPLAYMETER_H -#include #include -#include -#include -#include -#include -#include #include -//Added by qt3to4: -#include +#include +#include +#include +#include +#include #include - class RDPlayMeter : public QWidget { Q_OBJECT