Merge pull request #1548 from LennyMcLennington/fix/mr-list-text-layout

fix: Make modrinth text layout not be weird

launcher/ui/widgets/Common.cpp

@@ -1,13 +1,17 @@
 #include "Common.h"
 
+#include <QFontMetrics>
+
 // Origin: Qt
 // More specifically, this is a trimmed down version on the algorithm in:
 // https://code.woboq.org/qt5/qtbase/src/widgets/styles/qcommonstyle.cpp.html#846
-QList<std::pair<qreal, QString>> viewItemTextLayout(QTextLayout& textLayout, int lineWidth, qreal& height)
+QStringList viewItemTextLayout(QTextLayout& textLayout, QSize bounds, qreal& height)
 {
-    QList<std::pair<qreal, QString>> lines;
+    QStringList result;
     height = 0;
 
+    QFontMetrics fontMetrics{ textLayout.font() };
+
     textLayout.beginLayout();
 
     QString str = textLayout.text();
@@ -19,15 +23,23 @@ QList<std::pair<qreal, QString>> viewItemTextLayout(QTextLayout& textLayout, int
         if (line.textLength() == 0)
             break;
 
-        line.setLineWidth(lineWidth);
-        line.setPosition(QPointF(0, height));
-
+        line.setLineWidth(bounds.width());
         height += line.height();
 
-        lines.append(std::make_pair(line.naturalTextWidth(), str.mid(line.textStart(), line.textLength())));
+        // If the *next* line has enough space to be drawn, then we don't need to elide this line.
+        if (height + fontMetrics.lineSpacing() < bounds.height()) {
+            result.append(str.mid(line.textStart(), line.textLength()));
+        } else {
+            // Otherwise, if *this* line has enough space to be drawn, draw it elided.
+            if (height < bounds.height()) {
+                result.append(fontMetrics.elidedText(str.mid(line.textStart()), Qt::ElideRight, bounds.width()));
+            }
+            // And end it here, since we know there's not enough space to draw the next line.
+            break;
+        }
     }
 
     textLayout.endLayout();
 
-    return lines;
+    return result;
 }

launcher/ui/widgets/Common.h

@@ -6,4 +6,4 @@
  *  Returns a list of pairs, each containing the width of that line and that line's string, respectively.
  *  The total height of those lines is set in the last argument, 'height'.
  */
-QList<std::pair<qreal, QString>> viewItemTextLayout(QTextLayout& textLayout, int lineWidth, qreal& height);
+QStringList viewItemTextLayout(QTextLayout& textLayout, QSize bounds, qreal& height);

launcher/ui/widgets/ProjectItem.cpp

@@ -5,6 +5,8 @@
 #include <QIcon>
 #include <QPainter>
 
+#include <algorithm>
+
 ProjectItemDelegate::ProjectItemDelegate(QWidget* parent) : QStyledItemDelegate(parent) {}
 
 void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
@@ -34,6 +36,13 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
             icon_width = icon_size.width();
             icon_height = icon_size.height();
 
+            float desired_dim = rect.height() - 10;
+
+            auto scaleRatio = icon_width > icon_height ? desired_dim / icon_width : desired_dim / icon_height;
+
+            icon_width *= scaleRatio;
+            icon_height *= scaleRatio;
+
             icon_x_margin = (rect.height() - icon_width) / 2;
             icon_y_margin = (rect.height() - icon_height) / 2;
         }
@@ -47,9 +56,8 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
             opt.icon.paint(painter, x, y, icon_width, icon_height);
     }
 
-    // Change the rect so that funther painting is easier
-    auto remaining_width = rect.width() - icon_width - 2 * icon_x_margin;
-    rect.setRect(rect.x() + icon_width + 2 * icon_x_margin, rect.y(), remaining_width, rect.height());
+    // Change the rect so that further painting is easier
+    rect.setTopLeft(QPoint(rect.x() + icon_width + 2 * icon_x_margin, rect.y() + 4));
 
     {  // Title painting
         auto title = index.data(UserDataTypes::TITLE).toString();
@@ -66,10 +74,15 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
         font.setPointSize(font.pointSize() + 2);
         painter->setFont(font);
 
-        // On the top, aligned to the left after the icon
-        painter->drawText(rect.x(), rect.y() + QFontMetrics(font).height(), title);
+        QFontMetrics fontMetrics{font};
 
+        QRect titleRect(rect.topLeft() + QPoint(0, fontMetrics.ascent() - fontMetrics.height()), QSize(rect.width(), fontMetrics.height()));
+        // On the top, aligned to the left after the icon
+        painter->drawText(titleRect, title, QTextOption(Qt::AlignTop));
         painter->restore();
+
+        // Change the rect again so it takes up the space below the title text
+        rect.setTop(titleRect.bottom());
     }
 
     {  // Description painting
@@ -78,22 +91,45 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
         QTextLayout text_layout(description, opt.font);
 
         qreal height = 0;
-        auto cut_text = viewItemTextLayout(text_layout, remaining_width, height);
+        auto cut_text = viewItemTextLayout(text_layout, rect.size(), height);
 
-        // Get first line unconditionally
-        description = cut_text.first().second;
-        // Get second line, elided if needed
-        if (cut_text.size() > 1) {
-            if (cut_text.size() > 2)
-                description += opt.fontMetrics.elidedText(cut_text.at(1).second, opt.textElideMode, cut_text.at(1).first);
-            else
-                description += cut_text.at(1).second;
-        }
+        description = cut_text.join("\n");
 
-        // On the bottom, aligned to the left after the icon, and featuring at most two lines of text (with some margin space to spare)
-        painter->drawText(rect.x(), rect.y() + rect.height() - 2.2 * opt.fontMetrics.height(), remaining_width,
-                          2 * opt.fontMetrics.height(), Qt::TextWordWrap, description);
+        QRect descriptionRect = rect;
+        painter->drawText(descriptionRect, Qt::TextWordWrap, description);
     }
 
     painter->restore();
 }
+
+QSize ProjectItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    int height = 0;
+
+    // 2px spacing between top and title
+    height += 2;
+    {  // Ensure enough space for one line with the title font
+        auto font = option.font;
+        if (index.data(UserDataTypes::SELECTED).toBool()) {
+            font.setBold(true);
+            font.setUnderline(true);
+        }
+
+        font.setPointSize(font.pointSize() + 2);
+
+        // Ensure enough space for the title
+        height += QFontMetrics{ font }.height();
+    }
+
+    { // Ensure enough space for 2 lines of description text
+        height += QFontMetrics{ option.font }.lineSpacing() * 2;
+    }
+
+    QSize indexSizeHint = index.data(Qt::SizeHintRole).toSize();
+
+    if (indexSizeHint.isValid()) {
+        return QSize(indexSizeHint.width(), std::max(indexSizeHint.height(), height));
+    }
+
+    return QSize(0, height);
+}

launcher/ui/widgets/ProjectItem.h

@@ -21,5 +21,6 @@ class ProjectItemDelegate final : public QStyledItemDelegate {
         ProjectItemDelegate(QWidget* parent);
 
         void paint(QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const override;
+        QSize sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const override;
 
 };