QColorDialog: Emit done after setting the selected color.
Task-number: QTBUG-35859 Change-Id: I8b23d0283e9678c6698c174d0362cf8d85b2f813 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>bb10
parent
8d38c0f6d6
commit
4dcb607aa9
|
|
@ -2192,13 +2192,13 @@ bool QColorDialogPrivate::handleColorPickingKeyPress(QKeyEvent *e)
|
|||
void QColorDialog::done(int result)
|
||||
{
|
||||
Q_D(QColorDialog);
|
||||
QDialog::done(result);
|
||||
if (result == Accepted) {
|
||||
d->selectedQColor = d->currentQColor();
|
||||
emit colorSelected(d->selectedQColor);
|
||||
} else {
|
||||
d->selectedQColor = QColor();
|
||||
}
|
||||
QDialog::done(result);
|
||||
if (d->receiverToDisconnectOnClose) {
|
||||
disconnect(this, SIGNAL(colorSelected(QColor)),
|
||||
d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose);
|
||||
|
|
|
|||
Loading…
Reference in New Issue