From eacb554053fa23b14859214b285ed20c27170d63 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 8 Dec 2018 05:38:20 +0100
Subject: [PATCH] Ref T365, use not-wrapping tooltips

---
 .../settingssimulatorbasicscomponent.cpp      | 10 ++++++----
 src/blackmisc/htmlutils.cpp                   | 19 ++++++++++---------
 src/blackmisc/htmlutils.h                     |  5 ++++-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
index 00a643e96..28e2cd6c1 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
@@ -9,8 +9,10 @@
 
 #include "settingssimulatorbasicscomponent.h"
 #include "ui_settingssimulatorbasicscomponent.h"
+
 #include "blackmisc/simulation/xplane/xplaneutil.h"
 #include "blackmisc/fileutils.h"
+#include "blackmisc/htmlutils.h"
 #include "blackmisc/logmessage.h"
 #include "blackconfig/buildconfig.h"
 
@@ -329,10 +331,10 @@ namespace BlackGui
             }
             else
             {
-                const QString ms(m.join("<br>"));
+                const QString ms = m.join("<br>");
                 if (BrokenMultilinePlaceholder && m.size() > 1)
                 {
-                    ui->pte_ModelDirectories->setToolTip(ms);
+                    ui->pte_ModelDirectories->setToolTip(unwrappedTooltip(ms));
                     ui->pte_ModelDirectories->setPlaceholderText("See tooltip for defaults");
                 }
                 else
@@ -348,11 +350,11 @@ namespace BlackGui
             }
             else
             {
-                const QString es(e.join("<br>"));
+                const QString es = e.join("<br>");
                 if (BrokenMultilinePlaceholder && e.size() > 1)
                 {
                     //! \fixme correct version when Qt multiline placeholder is fixed https://bugreports.qt.io/browse/QTBUG-43817
-                    ui->pte_ExcludeDirectories->setToolTip(es);
+                    ui->pte_ExcludeDirectories->setToolTip(unwrappedTooltip(es));
                     ui->pte_ExcludeDirectories->setPlaceholderText("See tooltip for defaults");
                 }
                 else
diff --git a/src/blackmisc/htmlutils.cpp b/src/blackmisc/htmlutils.cpp
index 5af0c2610..469397e0e 100644
--- a/src/blackmisc/htmlutils.cpp
+++ b/src/blackmisc/htmlutils.cpp
@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include <QStringBuilder>
 #include "htmlutils.h"
+#include <QStringBuilder>
 
 namespace BlackMisc
 {
@@ -24,18 +24,19 @@ namespace BlackMisc
             html += QStringLiteral("<tr>");
             for (int c = 0; c < columns; c++)
             {
-                if (i < size)
-                {
-                    html += QStringLiteral("<td>") % values.at(i) % QStringLiteral("</td>");
-                }
-                else
-                {
-                    html += QStringLiteral("<td></td>");
-                }
+                html += (i < size) ?
+                        QStringLiteral("<td>") % values.at(i) % QStringLiteral("</td>") :
+                        QStringLiteral("<td></td>");
                 i++;
             }
             html += QStringLiteral("</tr>");
         }
         return QStringLiteral("<table>") % html % QStringLiteral("</table>");
     }
+
+    QString unwrappedTooltip(const QString &text)
+    {
+        return QStringLiteral("<p style='white-space:pre'>") % text % QStringLiteral("</p>");
+    }
+
 } // ns
diff --git a/src/blackmisc/htmlutils.h b/src/blackmisc/htmlutils.h
index 76c6e07eb..90c2c7836 100644
--- a/src/blackmisc/htmlutils.h
+++ b/src/blackmisc/htmlutils.h
@@ -12,9 +12,9 @@
 #ifndef BLACKMISC_HTMLUTILS_H
 #define BLACKMISC_HTMLUTILS_H
 
-#include <QStringBuilder>
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindexlist.h"
+#include <QStringBuilder>
 
 //! Free functions in BlackMisc
 namespace BlackMisc
@@ -39,6 +39,9 @@ namespace BlackMisc
     //! Values as HTML table
     BLACKMISC_EXPORT QString toHtmTable(const QStringList &values, int columns);
 
+    //! As white space preformatted
+    BLACKMISC_EXPORT QString unwrappedTooltip(const QString &text);
+
 } // ns
 
 #endif // guard