kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TechDraw] Use global DontUseNativeColorDialog parameter from BaseApp/Preferences/Dialog when opening color dialog

Browse Source
This commit is contained in:
mwganson
2022-01-02 15:44:11 -06:00
committed by wwmayer
parent 7a1695cb2c
commit abe76b35f4
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/TechDraw/Gui/mrichtextedit.cpp
View File

@@ -51,9 +51,9 @@
#include <Base/Console.h>
#include <Base/Parameter.h>
#include <Base/Tools.h>
#include <Gui/FileDialog.h>
#include <App/Application.h>
#include "PreferencesGui.h"
#include "mrichtextedit.h"
@@ -433,7 +433,12 @@ void MRichTextEdit::textStyle(int index) {
}
void MRichTextEdit::textFgColor() {
QColor col = QColorDialog::getColor(f_textedit->textColor(), this);
QColor col;
if (Gui::DialogOptions::dontUseNativeColorDialog()){
col = QColorDialog::getColor(f_textedit->textColor(),this, QLatin1String(""), QColorDialog::DontUseNativeDialog);
} else {
col = QColorDialog::getColor(f_textedit->textColor(), this);
}
QTextCursor cursor = f_textedit->textCursor();
if (!cursor.hasSelection()) {
cursor.select(QTextCursor::WordUnderCursor);
@@ -450,7 +455,12 @@ void MRichTextEdit::textFgColor() {
}
void MRichTextEdit::textBgColor() {
QColor col = QColorDialog::getColor(f_textedit->textBackgroundColor(), this);
QColor col;
if (Gui::DialogOptions::dontUseNativeColorDialog()){
col = QColorDialog::getColor(f_textedit->textBackgroundColor(),this, QLatin1String(""), QColorDialog::DontUseNativeDialog);
} else {
col = QColorDialog::getColor(f_textedit->textBackgroundColor(), this);
}
QTextCursor cursor = f_textedit->textCursor();
if (!cursor.hasSelection()) {
cursor.select(QTextCursor::WordUnderCursor);