From 5a2e9868c1e65862f6c139da338de41f9e30aa98 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Tue, 21 Aug 2018 22:13:05 -0500
Subject: [PATCH] Fixes #3681

This changes the way that the popup works to use [`QtColorDialog::getColor()`](http://doc.qt.io/archives/qt-4.8/qcolordialog.html#getColor) instead of the problematic open() function. Also makes the button change to create the modal dialog when pushed, rather than being a checkbox of sorts
---
 apps/opencs/view/widget/coloreditor.cpp      | 19 +------------------
 apps/opencs/view/widget/coloreditor.hpp      |  1 -
 apps/opencs/view/widget/colorpickerpopup.cpp | 13 +++----------
 apps/opencs/view/widget/colorpickerpopup.hpp |  2 --
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/apps/opencs/view/widget/coloreditor.cpp b/apps/opencs/view/widget/coloreditor.cpp
index 5f82f8e26..82ca2b0c9 100644
--- a/apps/opencs/view/widget/coloreditor.cpp
+++ b/apps/opencs/view/widget/coloreditor.cpp
@@ -1,11 +1,9 @@
 #include "coloreditor.hpp"
 
 #include <QApplication>
-#include <QColor>
 #include <QColorDialog>
 #include <QDesktopWidget>
 #include <QPainter>
-#include <QRect>
 #include <QShowEvent>
 
 #include "colorpickerpopup.hpp"
@@ -27,9 +25,7 @@ CSVWidget::ColorEditor::ColorEditor(QWidget *parent, const bool popupOnStart)
       mColorPicker(new ColorPickerPopup(this)),
       mPopupOnStart(popupOnStart)
 {
-    setCheckable(true);
     connect(this, SIGNAL(clicked()), this, SLOT(showPicker()));
-    connect(mColorPicker, SIGNAL(hid()), this, SLOT(pickerHid()));
     connect(mColorPicker, SIGNAL(colorChanged(const QColor &)), this, SLOT(pickerColorChanged(const QColor &)));
 }
 
@@ -85,20 +81,7 @@ void CSVWidget::ColorEditor::setColor(const int colorInt)
 
 void CSVWidget::ColorEditor::showPicker()
 {
-    if (isChecked())
-    {
-        mColorPicker->showPicker(calculatePopupPosition(), mColor);
-    }
-    else
-    {
-        mColorPicker->hide();
-    }
-}
-
-void CSVWidget::ColorEditor::pickerHid()
-{
-    setChecked(false);
-    emit pickingFinished();
+    mColorPicker->showPicker(calculatePopupPosition(), mColor);
 }
 
 void CSVWidget::ColorEditor::pickerColorChanged(const QColor &color)
diff --git a/apps/opencs/view/widget/coloreditor.hpp b/apps/opencs/view/widget/coloreditor.hpp
index 668f22cc9..368896e42 100644
--- a/apps/opencs/view/widget/coloreditor.hpp
+++ b/apps/opencs/view/widget/coloreditor.hpp
@@ -45,7 +45,6 @@ namespace CSVWidget
 
         private slots:
             void showPicker();
-            void pickerHid();
             void pickerColorChanged(const QColor &color);
 
         signals:
diff --git a/apps/opencs/view/widget/colorpickerpopup.cpp b/apps/opencs/view/widget/colorpickerpopup.cpp
index 8e71ce39e..47aab8981 100644
--- a/apps/opencs/view/widget/colorpickerpopup.cpp
+++ b/apps/opencs/view/widget/colorpickerpopup.cpp
@@ -4,7 +4,6 @@
 #include <QPushButton>
 #include <QEvent>
 #include <QKeyEvent>
-#include <QMouseEvent>
 #include <QLayout>
 #include <QStyleOption>
 
@@ -19,7 +18,6 @@ CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent)
     mColorPicker->setWindowFlags(Qt::Widget);
     mColorPicker->setOptions(QColorDialog::NoButtons | QColorDialog::DontUseNativeDialog);
     mColorPicker->installEventFilter(this);
-    mColorPicker->open();
     connect(mColorPicker,
             SIGNAL(currentColorChanged(const QColor &)),
             this,
@@ -39,8 +37,9 @@ void CSVWidget::ColorPickerPopup::showPicker(const QPoint &position, const QColo
     geometry.moveTo(position);
     setGeometry(geometry);
 
-    mColorPicker->setCurrentColor(initialColor);
-    show();
+    // Calling getColor() creates a blocking dialog that will continue execution once the user chooses OK or Cancel
+    QColor color = mColorPicker->getColor(initialColor);
+    mColorPicker->setCurrentColor(color);
 }
 
 void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event)
@@ -63,12 +62,6 @@ void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event)
     QFrame::mousePressEvent(event);
 }
 
-void CSVWidget::ColorPickerPopup::hideEvent(QHideEvent *event)
-{
-    QFrame::hideEvent(event);
-    emit hid();
-}
-
 bool CSVWidget::ColorPickerPopup::eventFilter(QObject *object, QEvent *event)
 {
     if (object == mColorPicker && event->type() == QEvent::KeyPress)
diff --git a/apps/opencs/view/widget/colorpickerpopup.hpp b/apps/opencs/view/widget/colorpickerpopup.hpp
index 602bbdb6d..eb5653f46 100644
--- a/apps/opencs/view/widget/colorpickerpopup.hpp
+++ b/apps/opencs/view/widget/colorpickerpopup.hpp
@@ -20,11 +20,9 @@ namespace CSVWidget
 
     protected:
         virtual void mousePressEvent(QMouseEvent *event);
-        virtual void hideEvent(QHideEvent *event);
         virtual bool eventFilter(QObject *object, QEvent *event);
 
     signals:
-        void hid();
         void colorChanged(const QColor &color);
     };
 }