Do not use elided text for multiline string with fixed font size (#11610

) Fixes #8383
OpenModelica · Nov 20, 2023 · ad47153 · ad47153
1 parent 5b94ed1
commit ad47153
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp
@@ -434,10 +434,10 @@ void TextAnnotation::drawAnnotation(QPainter *painter)
     painter->setFont(font);
   }
   /* Try to get the elided text if calculated font size <= Helper::minimumTextFontSize
-   * OR if font size is absolute.
+   * OR if font size is absolute and text is not multiline.
    */
   QString textToDraw = textString;
-  if (absMappedBoundingRect.width() > 1 && ((mFontSize <= 0 && painter->font().pointSizeF() <= Helper::minimumTextFontSize) || mFontSize > 0)) {
+  if (absMappedBoundingRect.width() > 1 && ((mFontSize <= 0 && painter->font().pointSizeF() <= Helper::minimumTextFontSize) || (mFontSize > 0 && !Utilities::isMultiline(textString)))) {
     QFontMetrics fontMetrics(painter->font());
     textToDraw = fontMetrics.elidedText(textString, Qt::ElideRight, absMappedBoundingRect.width());
     // if we get "..." i.e., QChar(0x2026) as textToDraw then don't draw anything

diff --git a/OMEdit/OMEditLIB/Util/Utilities.cpp b/OMEdit/OMEditLIB/Util/Utilities.cpp
@@ -1333,3 +1333,14 @@ void Utilities::setToolTip(QComboBox *pComboBox, const QString &description, con
   }
   pComboBox->setToolTip(QString("<html><head/><body><p>%1</p><ul>%2</ul></body></html>").arg(description, itemsToolTip));
 }
+
+/*!
+ * \brief Utilities::isMultiline
+ * Returns true if the text containts \n.
+ * \param text
+ * \return
+ */
+bool Utilities::isMultiline(const QString &text)
+{
+  return text.indexOf('\n') >= 0;
+}
diff --git a/OMEdit/OMEditLIB/Util/Utilities.h b/OMEdit/OMEditLIB/Util/Utilities.h
@@ -523,6 +523,7 @@ namespace Utilities {
   QString convertSymbolToUnit(const QString &symbol);
   QRectF adjustSceneRectangle(const QRectF sceneRectangle, const qreal factor);
   void setToolTip(QComboBox *pComboBox, const QString &description, const QStringList &optionsDescriptions);
+  bool isMultiline(const QString &text);
 } // namespace Utilities
 
 #endif // UTILITIES_H