From 8d6ff3c07b431e6534132b65805b84ebec4c517d Mon Sep 17 00:00:00 2001
From: Mark Ganson TheMarkster <39143564+mwganson@users.noreply.github.com>
Date: Wed, 5 Jan 2022 05:23:14 -0600
Subject: [PATCH] =?UTF-8?q?[Spreadsheet]=20Use=20DontUseNativeColorDialog?=
 =?UTF-8?q?=20parameter=20when=20using=20QtCol=E2=80=A6=20(#5326)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Spreadsheet] Use DontUseNativeColorDialog parameter when using QtColorDialog::getColor()
---
 src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
index 4372ad99cb..3e15eb38d4 100644
--- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
+++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
@@ -65,7 +65,7 @@
 #include <math.h>
 
 #include <QScreen>
-
+#include <Gui/FileDialog.h>
 #include "qtcolorpicker.h"
 
 /*! \class QtColorPicker
@@ -902,7 +902,12 @@ void ColorPickerPopup::getColorFromDialog()
 {
     //bool ok;
     //QRgb rgb = QColorDialog::getRgba(lastSel.rgba(), &ok, parentWidget());
-    QColor col = QColorDialog::getColor(lastSel,parentWidget(),0,QColorDialog::ShowAlphaChannel);
+    QColor col;
+    if (Gui::DialogOptions::dontUseNativeColorDialog()){
+        col = QColorDialog::getColor(lastSel, parentWidget(), 0, QColorDialog::ShowAlphaChannel|QColorDialog::DontUseNativeDialog);
+    } else {
+        col = QColorDialog::getColor(lastSel, parentWidget(), 0, QColorDialog::ShowAlphaChannel);
+    }
     if (!col.isValid())
     return;