1 files changed, 214 insertions, 26 deletions

diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index c08a034d9e..5da41aa0a5 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -63,6 +63,8 @@
 #include "qmimedata.h"
 #include "qspinbox.h"
 #include "qdialogbuttonbox.h"
+#include "qscreen.h"
+#include "qcursor.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -920,6 +922,8 @@ signals:
 private slots:
     void rgbEd();
     void hsvEd();
+    void htmlEd();
+
 private:
     void showCurrentColor();
     int hue, sat, val;
@@ -931,6 +935,7 @@ private:
     QLabel *lblRed;
     QLabel *lblGreen;
     QLabel *lblBlue;
+    QLabel *lblHtml;
     QColSpinBox *hEd;
     QColSpinBox *sEd;
     QColSpinBox *vEd;
@@ -939,6 +944,7 @@ private:
     QColSpinBox *bEd;
     QColSpinBox *alphaEd;
     QLabel *alphaLab;
+    QLineEdit *htEd;
     QColorShowLabel *lab;
     bool rgbOriginal;
     QColorDialog *colorDialog;
@@ -1230,6 +1236,19 @@ QColorShower::QColorShower(QColorDialog *parent)
 #endif
     alphaEd->hide();
     alphaLab->hide();
+    lblHtml = new QLabel(this);
+    htEd = new QLineEdit(this);
+#ifndef QT_NO_SHORTCUT
+    lblHtml->setBuddy(htEd);
+#endif
+
+    QRegularExpression regExp(QStringLiteral("#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})"));
+    QRegularExpressionValidator *validator = new QRegularExpressionValidator(regExp, this);
+    htEd->setValidator(validator);
+
+    lblHtml->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+    gl->addWidget(lblHtml, 5, 1);
+    gl->addWidget(htEd, 5, 2);
 
     connect(hEd, SIGNAL(valueChanged(int)), this, SLOT(hsvEd()));
     connect(sEd, SIGNAL(valueChanged(int)), this, SLOT(hsvEd()));
@@ -1239,6 +1258,7 @@ QColorShower::QColorShower(QColorDialog *parent)
     connect(gEd, SIGNAL(valueChanged(int)), this, SLOT(rgbEd()));
     connect(bEd, SIGNAL(valueChanged(int)), this, SLOT(rgbEd()));
     connect(alphaEd, SIGNAL(valueChanged(int)), this, SLOT(rgbEd()));
+    connect(htEd, SIGNAL(textEdited(QString)), this, SLOT(htmlEd()));
 
     retranslateStrings();
 }
@@ -1251,7 +1271,7 @@ inline bool QColorDialogPrivate::isAlphaVisible() const { return cs->isAlphaVisi
 
 QColor QColorDialogPrivate::currentQColor() const
 {
-    if (!options->testOption(QColorDialogOptions::DontUseNativeDialog) && nativeDialogInUse)
+    if (nativeDialogInUse)
         return platformColorDialogHelper()->currentColor();
     return cs->currentQColor();
 }
@@ -1273,6 +1293,8 @@ void QColorShower::rgbEd()
     sEd->setValue(sat);
     vEd->setValue(val);
 
+    htEd->setText(QColor(curCol).name());
+
     showCurrentColor();
     emit newCol(currentColor());
     updateQColor();
@@ -1293,6 +1315,31 @@ void QColorShower::hsvEd()
     gEd->setValue(qGreen(currentColor()));
     bEd->setValue(qBlue(currentColor()));
 
+    htEd->setText(c.name());
+
+    showCurrentColor();
+    emit newCol(currentColor());
+    updateQColor();
+}
+
+void QColorShower::htmlEd()
+{
+    QColor c;
+    QString t = htEd->text();
+    c.setNamedColor(t);
+    if (!c.isValid())
+        return;
+    curCol = qRgba(c.red(), c.green(), c.blue(), currentAlpha());
+    rgb2hsv(curCol, hue, sat, val);
+
+    hEd->setValue(hue);
+    sEd->setValue(sat);
+    vEd->setValue(val);
+
+    rEd->setValue(qRed(currentColor()));
+    gEd->setValue(qGreen(currentColor()));
+    bEd->setValue(qBlue(currentColor()));
+
     showCurrentColor();
     emit newCol(currentColor());
     updateQColor();
@@ -1313,6 +1360,8 @@ void QColorShower::setRgb(QRgb rgb)
     gEd->setValue(qGreen(currentColor()));
     bEd->setValue(qBlue(currentColor()));
 
+    htEd->setText(QColor(rgb).name());
+
     showCurrentColor();
     updateQColor();
 }
@@ -1336,6 +1385,8 @@ void QColorShower::setHsv(int h, int s, int v)
     gEd->setValue(qGreen(currentColor()));
     bEd->setValue(qBlue(currentColor()));
 
+    htEd->setText(c.name());
+
     showCurrentColor();
     updateQColor();
 }
@@ -1349,6 +1400,7 @@ void QColorShower::retranslateStrings()
     lblGreen->setText(QColorDialog::tr("&Green:"));
     lblBlue->setText(QColorDialog::tr("Bl&ue:"));
     alphaLab->setText(QColorDialog::tr("A&lpha channel:"));
+    lblHtml->setText(QColorDialog::tr("&HTML:"));
 }
 
 void QColorShower::updateQColor()
@@ -1362,16 +1414,20 @@ void QColorShower::updateQColor()
 //sets all widgets to display h,s,v
 void QColorDialogPrivate::_q_newHsv(int h, int s, int v)
 {
-    cs->setHsv(h, s, v);
-    cp->setCol(h, s);
-    lp->setCol(h, s, v);
+    if (!nativeDialogInUse) {
+        cs->setHsv(h, s, v);
+        cp->setCol(h, s);
+        lp->setCol(h, s, v);
+    }
 }
 
 //sets all widgets to display rgb
 void QColorDialogPrivate::setCurrentColor(QRgb rgb)
 {
-    cs->setRgb(rgb);
-    _q_newColorTypedIn(rgb);
+    if (!nativeDialogInUse) {
+        cs->setRgb(rgb);
+        _q_newColorTypedIn(rgb);
+    }
 }
 
 // hack; doesn't keep curCol in sync, so use with care
@@ -1421,13 +1477,24 @@ bool QColorDialogPrivate::selectColor(const QColor &col)
     return false;
 }
 
+QColor QColorDialogPrivate::grabScreenColor(const QPoint &p)
+{
+    const QDesktopWidget *desktop = QApplication::desktop();
+    const QPixmap pixmap = QGuiApplication::screens().at(desktop->screenNumber())->grabWindow(desktop->winId(),
+                                                                                              p.x(), p.y(), 1, 1);
+    QImage i = pixmap.toImage();
+    return i.pixel(0, 0);
+}
+
 //sets all widgets except cs to display rgb
 void QColorDialogPrivate::_q_newColorTypedIn(QRgb rgb)
 {
-    int h, s, v;
-    rgb2hsv(rgb, h, s, v);
-    cp->setCol(h, s);
-    lp->setCol(h, s, v);
+    if (!nativeDialogInUse) {
+        int h, s, v;
+        rgb2hsv(rgb, h, s, v);
+        cp->setCol(h, s);
+        lp->setCol(h, s, v);
+    }
 }
 
 void QColorDialogPrivate::_q_nextCustom(int r, int c)
@@ -1450,6 +1517,48 @@ void QColorDialogPrivate::_q_newStandard(int r, int c)
         custom->setSelected(-1,-1);
 }
 
+void QColorDialogPrivate::_q_pickScreenColor()
+{
+    Q_Q(QColorDialog);
+    screenColorPicking = true;
+    // If user pushes Escape, the last color before picking will be restored.
+    beforeScreenColorPicking = cs->currentColor();
+    /*For some reason, q->grabMouse(Qt::CrossCursor) doesn't change
+     * the cursor, and therefore I have to change it manually.
+     */
+    q->grabMouse();
+    q->setCursor(Qt::CrossCursor);
+    q->grabKeyboard();
+    /* With setMouseTracking(true) the desired color can be more precisedly picked up,
+     * and continuously pushing the mouse button is not necessary.
+     */
+    q->setMouseTracking(true);
+
+    addCusBt->setDisabled(true);
+    buttons->setDisabled(true);
+    screenColorPickerButton->setDisabled(true);
+
+    q->setCurrentColor(grabScreenColor(QCursor::pos()));
+    lblScreenColorInfo->setText(QColorDialog::tr("Cursor at %1, %2, color: %3\nPress ESC to cancel")
+                                .arg(QCursor::pos().x())
+                                .arg(QCursor::pos().y())
+                                .arg(q->currentColor().name()));
+}
+
+void QColorDialogPrivate::releaseColorPicking()
+{
+    Q_Q(QColorDialog);
+    screenColorPicking = false;
+    q->releaseMouse();
+    q->releaseKeyboard();
+    q->setCursor(Qt::ArrowCursor);
+    q->setMouseTracking(false);
+    lblScreenColorInfo->setText(QLatin1String("\n"));
+    addCusBt->setDisabled(false);
+    buttons->setDisabled(false);
+    screenColorPickerButton->setDisabled(false);
+}
+
 void QColorDialogPrivate::init(const QColor &initial)
 {
     Q_Q(QColorDialog);
@@ -1457,9 +1566,24 @@ void QColorDialogPrivate::init(const QColor &initial)
     q->setSizeGripEnabled(false);
     q->setWindowTitle(QColorDialog::tr("Select Color"));
 
+    // default: use the native dialog if possible.  Can be overridden in setOptions()
     nativeDialogInUse = (platformColorDialogHelper() != 0);
-
+    screenColorPicking = false;
     nextCust = 0;
+
+    if (!nativeDialogInUse)
+        initWidgets();
+
+#ifdef Q_WS_MAC
+    delegate = 0;
+#endif
+
+    q->setCurrentColor(initial);
+}
+
+void QColorDialogPrivate::initWidgets()
+{
+    Q_Q(QColorDialog);
     QVBoxLayout *mainLay = new QVBoxLayout(q);
     // there's nothing in this dialog that benefits from sizing up
     mainLay->setSizeConstraint(QLayout::SetFixedSize);
@@ -1494,6 +1618,15 @@ void QColorDialogPrivate::init(const QColor &initial)
         leftLay->addWidget(lblBasicColors);
         leftLay->addWidget(standard);
 
+#if !defined(Q_OS_WINCE) && !defined(QT_SMALL_COLORDIALOG)
+        // The screen color picker button
+        screenColorPickerButton = new QPushButton(QColorDialog::tr("Pick Screen Color"));
+        leftLay->addWidget(screenColorPickerButton);
+        lblScreenColorInfo = new QLabel(QLatin1String("\n"));
+        leftLay->addWidget(lblScreenColorInfo);
+        q->connect(screenColorPickerButton, SIGNAL(clicked()), SLOT(_q_pickScreenColor()));
+#endif
+
 #if !defined(Q_OS_WINCE)
         leftLay->addStretch();
 #endif
@@ -1597,12 +1730,6 @@ void QColorDialogPrivate::init(const QColor &initial)
     QObject::connect(cancel, SIGNAL(clicked()), q, SLOT(reject()));
 
     retranslateStrings();
-
-#ifdef Q_WS_MAC
-    delegate = 0;
-#endif
-
-    q->setCurrentColor(initial);
 }
 
 void QColorDialogPrivate::initHelper(QPlatformDialogHelper *h)
@@ -1667,6 +1794,11 @@ static const Qt::WindowFlags DefaultWindowFlags =
     during the execution of the program. Use setCustomColor() to set
     the custom colors, and use customColor() to get them.
 
+    When pressing the "Pick Screen Color" button, the cursor changes to a haircross
+    and the colors on the screen are scanned. The user can pick up one by clicking
+    the mouse or the Enter button. Pressing Escape restores the last color selected
+    before entering this mode.
+
     The \l{dialogs/standarddialogs}{Standard Dialogs} example shows
     how to use QColorDialog as well as other built-in Qt dialogs.
 
@@ -1708,12 +1840,13 @@ QColorDialog::QColorDialog(const QColor &initial, QWidget *parent)
 void QColorDialog::setCurrentColor(const QColor &color)
 {
     Q_D(QColorDialog);
-    d->setCurrentColor(color.rgb());
-    d->selectColor(color);
-    d->setCurrentAlpha(color.alpha());
-
-    if (!testOption(QColorDialog::DontUseNativeDialog) && d->nativeDialogInUse)
+    if (d->nativeDialogInUse)
         d->platformColorDialogHelper()->setCurrentColor(color);
+    else {
+        d->setCurrentColor(color.rgb());
+        d->selectColor(color);
+        d->setCurrentAlpha(color.alpha());
+    }
 }
 
 QColor QColorDialog::currentColor() const
@@ -1783,10 +1916,14 @@ void QColorDialog::setOptions(ColorDialogOptions options)
         return;
 
     d->options->setOptions(QColorDialogOptions::ColorDialogOptions(int(options)));
-    d->buttons->setVisible(!(options & NoButtons));
-    d->showAlpha(options & ShowAlphaChannel);
-    if (options & DontUseNativeDialog)
+    if ((options & DontUseNativeDialog) && d->nativeDialogInUse) {
         d->nativeDialogInUse = false;
+        d->initWidgets();
+    }
+    if (!d->nativeDialogInUse) {
+        d->buttons->setVisible(!(options & NoButtons));
+        d->showAlpha(options & ShowAlphaChannel);
+    }
 }
 
 QColorDialog::ColorDialogOptions QColorDialog::options() const
@@ -1868,7 +2005,7 @@ void QColorDialog::setVisible(bool visible)
     }
 #else
 
-    if (!(options() & DontUseNativeDialog) && d->nativeDialogInUse) {
+    if (d->nativeDialogInUse) {
         d->setNativeDialogVisible(visible);
         // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below
         // updates the state correctly, but skips showing the non-native version:
@@ -1983,6 +2120,57 @@ void QColorDialog::changeEvent(QEvent *e)
 }
 
 /*!
+    \reimp
+*/
+void QColorDialog::mouseMoveEvent(QMouseEvent *e)
+{
+    Q_D(QColorDialog);
+    if (d->screenColorPicking) {
+        setCurrentColor(d->grabScreenColor(e->globalPos()));
+        d->lblScreenColorInfo->setText(QColorDialog::tr("Cursor at %1, %2, color: %3\nPress ESC to cancel")
+                                       .arg(e->globalPos().x())
+                                       .arg(e->globalPos().y())
+                                       .arg(currentColor().name()));
+        return;
+    }
+    QDialog::mouseMoveEvent(e);
+}
+
+/*!
+    \reimp
+*/
+void QColorDialog::mouseReleaseEvent(QMouseEvent *e)
+{
+    Q_D(QColorDialog);
+    if (d->screenColorPicking) {
+        setCurrentColor(d->grabScreenColor(e->globalPos()));
+        d->releaseColorPicking();
+        return;
+    }
+    QDialog::mouseReleaseEvent(e);
+}
+
+/*!
+    \reimp
+*/
+void QColorDialog::keyPressEvent(QKeyEvent *e)
+{
+    Q_D(QColorDialog);
+    if (d->screenColorPicking) {
+        if (e->key() == Qt::Key_Escape) {
+            d->releaseColorPicking();
+            d->setCurrentColor(d->beforeScreenColorPicking);
+        } else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
+            setCurrentColor(d->grabScreenColor(QCursor::pos()));
+            d->releaseColorPicking();
+        }
+        e->accept();
+        return;
+    }
+    QDialog::keyPressEvent(e);
+}
+
+/*!
   Closes the dialog and sets its result code to \a result. If this dialog
   is shown with exec(), done() causes the local event loop to finish,
   and exec() to return \a result.