Merged merge request !39

CHANGELOG.md

@@ -23,6 +23,7 @@
     Bug #3533: GetSpellEffects should detect effects with zero duration
     Bug #3591: Angled hit distance too low
     Bug #3629: DB assassin attack never triggers creature spawning
+    Bug #3681: OpenMW-CS: Clicking Scripts in Preferences spawns many color pickers
     Bug #3788: GetPCInJail and GetPCTraveling do not work as in vanilla
     Bug #3876: Landscape texture painting is misaligned
     Bug #3897: Have Goodbye give all choices the effects of Goodbye

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);
-    {
-        mColorPicker->showPicker(calculatePopupPosition(), mColor);
-    }
-    else
-    {
-        mColorPicker->hide();
-    }
-}
-
-void CSVWidget::ColorEditor::pickerHid()
-{
-    setChecked(false);
-    emit pickingFinished();
 }
 
 void CSVWidget::ColorEditor::pickerColorChanged(const QColor &color)

apps/opencs/view/widget/coloreditor.hpp

@@ -45,7 +45,6 @@ namespace CSVWidget
 
         private slots:
             void showPicker();
-            void pickerHid();
             void pickerColorChanged(const QColor &color);
 
         signals:

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);
+    // Calling getColor() creates a blocking dialog that will continue execution once the user chooses OK or Cancel
-    show();
+    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)

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);
     };
 }