From e5f43788e874e638e1d4dbab20451c36e52df10d Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Fri, 1 Jan 2021 13:51:36 +0100
Subject: Visual fixes for the modlist.

- Fix invalid positions of markers in the scrollbar.
- Use color from children for collapsed elements (background and markers).
---
 src/viewmarkingscrollbar.cpp | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'src/viewmarkingscrollbar.cpp')

diff --git a/src/viewmarkingscrollbar.cpp b/src/viewmarkingscrollbar.cpp
index 0991f171..fb165922 100644
--- a/src/viewmarkingscrollbar.cpp
+++ b/src/viewmarkingscrollbar.cpp
@@ -4,9 +4,11 @@
 #include <QStyleOptionSlider>
 #include <QPainter>
 
-ViewMarkingScrollBar::ViewMarkingScrollBar(QAbstractItemModel* model, int role, QWidget *parent)
-  : QScrollBar(parent)
-  , m_model(model)
+using namespace MOShared;
+
+ViewMarkingScrollBar::ViewMarkingScrollBar(QTreeView* view, int role)
+  : QScrollBar(view)
+  , m_view(view)
   , m_role(role)
 {
   // not implemented for horizontal sliders
@@ -15,7 +17,7 @@ ViewMarkingScrollBar::ViewMarkingScrollBar(QAbstractItemModel* model, int role,
 
 void ViewMarkingScrollBar::paintEvent(QPaintEvent* event)
 {
-  if (m_model == nullptr) {
+  if (m_view->model() == nullptr) {
     return;
   }
   QScrollBar::paintEvent(event);
@@ -28,17 +30,27 @@ void ViewMarkingScrollBar::paintEvent(QPaintEvent* event)
   QRect handleRect = style()->subControlRect(QStyle::CC_ScrollBar, &styleOption, QStyle::SC_ScrollBarSlider, this);
   QRect innerRect = style()->subControlRect(QStyle::CC_ScrollBar, &styleOption, QStyle::SC_ScrollBarGroove, this);
 
-  auto indices = flatIndex(m_model, 0, QModelIndex());
+  auto indices = visibleIndex(m_view, 0);
 
   painter.translate(innerRect.topLeft() + QPoint(0, 3));
   qreal scale = static_cast<qreal>(innerRect.height() - 3) / static_cast<qreal>(indices.size());
 
   for (int i = 0; i < indices.size(); ++i) {
     QVariant data = indices[i].data(m_role);
-    if (data.isValid()) {
-      QColor col = data.value<QColor>();
-      painter.setPen(col);
-      painter.setBrush(col);
+    QColor color;
+
+    if (data.canConvert<QColor>()) {
+      color = data.value<QColor>();
+    }
+
+    auto childrenColor = MOShared::childrenColor(indices[i], m_view, m_role);
+    if (childrenColor.isValid()) {
+      color = childrenColor;
+    }
+
+    if (color.isValid()) {
+      painter.setPen(color);
+      painter.setBrush(color);
       painter.drawRect(QRect(2, i * scale - 2, handleRect.width() - 5, 3));
     }
   }
-- 
cgit v1.3.1