From 68521209c3964dfa5eb5d0aa1a322b2648e6beb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= <fc86@outlook.fr>
Date: Tue, 10 Oct 2017 17:53:20 +0200
Subject: [PATCH] missing fix on pickFont + DontUseNativeDialog on pickColor

---
 src/domain/UBGraphicsTextItemDelegate.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp
index eb117079..b90a9062 100644
--- a/src/domain/UBGraphicsTextItemDelegate.cpp
+++ b/src/domain/UBGraphicsTextItemDelegate.cpp
@@ -322,7 +322,7 @@ void UBGraphicsTextItemDelegate::pickFont()
 {
     if (mDelegated && mDelegated->scene() && mDelegated->scene()->views().size() > 0)
     {
-        QFontDialog fontDialog(delegated()->textCursor().charFormat().font(), mDelegated->scene()->views().at(0));
+        QFontDialog fontDialog(delegated()->textCursor().charFormat().font(), static_cast<QGraphicsView*>(UBApplication::boardController->controlView()));
         customize(fontDialog);
 
         if (fontDialog.exec())
@@ -357,6 +357,7 @@ void UBGraphicsTextItemDelegate::pickColor()
     {
         QColorDialog colorDialog(delegated()->defaultTextColor(), static_cast<QGraphicsView*>(UBApplication::boardController->controlView()));
         colorDialog.setWindowTitle(tr("Text Color"));
+        colorDialog.setOption(QColorDialog::DontUseNativeDialog);
         if (UBSettings::settings()->isDarkBackground())
         {
             colorDialog.setStyleSheet("background-color: white;");