AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QColorDialog: Streamline painting code of QColorLuminancePicker.

Browse Source 
Task-number: QTBUG-36078
Change-Id: Iea7dcb1fdae955615345aa835dc0b1a67840f39d
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2014-01-28 16:53:32 +01:00 committed by The Qt Project
parent e13b0cc4a0
commit fa83803119
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/dialogs/qcolordialog.cpp
View File

@ -66,6 +66,8 @@
#include "qscreen.h" #include "qscreen.h"
#include "qcursor.h" #include "qcursor.h"
#include <algorithm>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
//////////// QWellArray BEGIN //////////// QWellArray BEGIN
@ -758,13 +760,9 @@ void QColorLuminancePicker::paintEvent(QPaintEvent *)
int y; int y;
uint *pixel = (uint *) img.scanLine(0); uint *pixel = (uint *) img.scanLine(0);
for (y = 0; y < hi; y++) { for (y = 0; y < hi; y++) {
const uint *end = pixel + wi; uint *end = pixel + wi;
while (pixel < end) { std::fill(pixel, end, QColor::fromHsv(hue, sat, y2val(y + coff)).rgb());
QColor c; pixel = end;
c.setHsv(hue, sat, y2val(y+coff));
*pixel = c.rgb();
++pixel;
}
} }
pix = new QPixmap(QPixmap::fromImage(img)); pix = new QPixmap(QPixmap::fromImage(img));
} }