kopia lustrzana https://gitlab.com/eliggett/wfview
Fixed bug relate to pressing cancel in the color picker.
rodzic
1388c756c4
commit
d11ae30b1a
|
@ -236,7 +236,7 @@ void meter::paintEvent(QPaintEvent *)
|
||||||
|
|
||||||
void meter::drawLabel(QPainter *qp)
|
void meter::drawLabel(QPainter *qp)
|
||||||
{
|
{
|
||||||
qp->setPen(lowLineColor);
|
qp->setPen(lowTextColor);
|
||||||
qp->drawText(0,scaleTextYstart, label );
|
qp->drawText(0,scaleTextYstart, label );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6275,7 +6275,10 @@ QColor wfmain::getColorFromPicker(QColor initialColor)
|
||||||
options.setFlag(QColorDialog::ShowAlphaChannel, true);
|
options.setFlag(QColorDialog::ShowAlphaChannel, true);
|
||||||
options.setFlag(QColorDialog::DontUseNativeDialog, true);
|
options.setFlag(QColorDialog::DontUseNativeDialog, true);
|
||||||
QColor selColor = QColorDialog::getColor(initialColor, this, "Select Color", options);
|
QColor selColor = QColorDialog::getColor(initialColor, this, "Select Color", options);
|
||||||
return selColor;
|
if(selColor.isValid())
|
||||||
|
return selColor;
|
||||||
|
else
|
||||||
|
return initialColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::getSetColor(QLedLabel *led, QLabel *label)
|
void wfmain::getSetColor(QLedLabel *led, QLabel *label)
|
||||||
|
|
Ładowanie…
Reference in New Issue