diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-06-24 09:41:53 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-06-24 09:41:53 (GMT) |
| commit | 687fed8c198a6a35b4e43f4993027e4a62470fe6 (patch) | |
| tree | fa3efb0a0c61bef5bfbd3424dddb8ef1f80a4ee7 /src/gui/dialogs/qcolordialog.cpp | |
| parent | bcc60400c2bc317f96126434b017affbd32df894 (diff) | |
| download | Qt-687fed8c198a6a35b4e43f4993027e4a62470fe6.zip Qt-687fed8c198a6a35b4e43f4993027e4a62470fe6.tar.gz Qt-687fed8c198a6a35b4e43f4993027e4a62470fe6.tar.bz2 | |
QColorDialog: Fix setting of alpha values
When alpha was changed and then another color was picked in the GUI
still the old alpha remained (good) but it was not returned in
the returned color (bad).
Task-number: 256164
Reviewed-by: jasplin
Diffstat (limited to 'src/gui/dialogs/qcolordialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qcolordialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp index b2aaf1d..510c0c4 100644 --- a/src/gui/dialogs/qcolordialog.cpp +++ b/src/gui/dialogs/qcolordialog.cpp @@ -1262,7 +1262,7 @@ void QColorShower::retranslateStrings() void QColorShower::updateQColor() { QColor oldQColor(curQColor); - curQColor.setRgba(qRgba(qRed(curCol), qGreen(curCol), qBlue(curCol), qAlpha(curCol))); + curQColor.setRgba(qRgba(qRed(curCol), qGreen(curCol), qBlue(curCol), currentAlpha())); if (curQColor != oldQColor) emit currentColorChanged(curQColor); } |