[Spreadsheet] Use DontUseNativeColorDialog parameter when using QtCol… (#5326)
* [Spreadsheet] Use DontUseNativeColorDialog parameter when using QtColorDialog::getColor()
This commit is contained in:
committed by
GitHub
parent
f3f6f08e31
commit
10aae4619a
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user