From 2606b10c7efdaa65e56ece77bad90bd55c154111 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Fri, 8 Jan 2021 20:15:01 +0100
Subject: Display upgrade/warning for versions on collapsed separators.

---
 src/modlistversiondelegate.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/modlistversiondelegate.cpp

(limited to 'src/modlistversiondelegate.cpp')

diff --git a/src/modlistversiondelegate.cpp b/src/modlistversiondelegate.cpp
new file mode 100644
index 00000000..f60edcf8
--- /dev/null
+++ b/src/modlistversiondelegate.cpp
@@ -0,0 +1,60 @@
+#include "modlistversiondelegate.h"
+
+#include "modlistview.h"
+#include "log.h"
+
+ModListVersionDelegate::ModListVersionDelegate(ModListView* view) :
+  QItemDelegate(view), m_view(view) { }
+
+
+void ModListVersionDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+  m_view->itemDelegate()->paint(painter, option, index);
+
+  if (m_view->hasCollapsibleSeparators()
+    && m_view->model()->hasChildren(index)
+    && !m_view->isExpanded(index.sibling(index.row(), 0))) {
+    auto* model = m_view->model();
+
+    bool downgrade = false, upgrade = false;
+
+    for (int i = 0; i < model->rowCount(index); ++i) {
+      const auto mIndex = model->index(i, index.column(), index).data(ModList::IndexRole);
+      if (mIndex.isValid()) {
+        auto info = ModInfo::getByIndex(mIndex.toInt());
+        downgrade = downgrade || info->downgradeAvailable();
+        upgrade = upgrade || info->updateAvailable();
+      }
+    }
+
+    const int margin = m_view->style()->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr, m_view) + 1;
+
+    QStyleOptionViewItem opt(option);
+    const int sz = m_view->style()->pixelMetric(QStyle::PM_SmallIconSize, nullptr, m_view);
+    opt.decorationSize = QSize(sz, sz);
+    opt.decorationAlignment = Qt::AlignCenter;
+
+    if (upgrade) {
+      QIcon icon(":/MO/gui/update_available");
+      QPixmap pixmap = decoration(opt, icon);
+
+      QSize pm = icon.actualSize(opt.decorationSize);
+      pm.rwidth() += 2 * margin;
+      opt.rect.setRect(opt.rect.x(), opt.rect.y(), pm.width(), opt.rect.height());
+
+      drawDecoration(painter, opt, opt.rect, pixmap);
+    }
+
+    if (downgrade) {
+      QIcon icon(":/MO/gui/warning");
+      QPixmap pixmap = decoration(opt, icon);
+
+      QSize pm = icon.actualSize(opt.decorationSize);
+      pm.rwidth() += 2 * margin;
+      opt.rect.setRect(opt.rect.x() + opt.decorationSize.width() + margin, opt.rect.y(), pm.width(), opt.rect.height());
+
+      drawDecoration(painter, opt, opt.rect, pixmap);
+
+    }
+  }
+}
-- 
cgit v1.3.1


From 883ca5d376d9cc7de17620d3b0444e201c683da0 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Fri, 8 Jan 2021 20:34:00 +0100
Subject: Left-align warning icon if there is no update icon in the column
 version.

---
 src/modlistversiondelegate.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/modlistversiondelegate.cpp')

diff --git a/src/modlistversiondelegate.cpp b/src/modlistversiondelegate.cpp
index f60edcf8..657718f5 100644
--- a/src/modlistversiondelegate.cpp
+++ b/src/modlistversiondelegate.cpp
@@ -41,8 +41,10 @@ void ModListVersionDelegate::paint(QPainter* painter, const QStyleOptionViewItem
       QSize pm = icon.actualSize(opt.decorationSize);
       pm.rwidth() += 2 * margin;
       opt.rect.setRect(opt.rect.x(), opt.rect.y(), pm.width(), opt.rect.height());
-
       drawDecoration(painter, opt, opt.rect, pixmap);
+
+      // add margin for next icon (if any)
+      opt.rect.adjust(opt.decorationSize.width() + margin, 0, 0, 0);
     }
 
     if (downgrade) {
@@ -51,7 +53,7 @@ void ModListVersionDelegate::paint(QPainter* painter, const QStyleOptionViewItem
 
       QSize pm = icon.actualSize(opt.decorationSize);
       pm.rwidth() += 2 * margin;
-      opt.rect.setRect(opt.rect.x() + opt.decorationSize.width() + margin, opt.rect.y(), pm.width(), opt.rect.height());
+      opt.rect.setRect(opt.rect.x(), opt.rect.y(), pm.width(), opt.rect.height());
 
       drawDecoration(painter, opt, opt.rect, pixmap);
 
-- 
cgit v1.3.1