diff --git a/src/modules/welcome/checker/ResultDelegate.cpp b/src/modules/welcome/checker/ResultDelegate.cpp index f3984ed87..f9fa372f9 100644 --- a/src/modules/welcome/checker/ResultDelegate.cpp +++ b/src/modules/welcome/checker/ResultDelegate.cpp @@ -23,7 +23,7 @@ item_fontsize() } static void -paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) +paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, int role ) { QRect textRect = option.rect.adjusted( item_margin, item_margin, -item_margin, -item_margin ); QFont font = qApp->font(); @@ -48,8 +48,7 @@ paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const Q } } - - painter->drawText( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, index.data().toString() ); + painter->drawText( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, index.data( role ).toString() ); } QSize @@ -82,7 +81,7 @@ ResultDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co initStyleOption( &opt, index ); opt.text.clear(); - paintRequirement( painter, opt, index ); + paintRequirement( painter, opt, index, m_textRole ); painter->restore(); } diff --git a/src/modules/welcome/checker/ResultDelegate.h b/src/modules/welcome/checker/ResultDelegate.h index 9d0fc6349..db770502e 100644 --- a/src/modules/welcome/checker/ResultDelegate.h +++ b/src/modules/welcome/checker/ResultDelegate.h @@ -12,6 +12,8 @@ #include +#include "modulesystem/RequirementsModel.h" + /** * @brief Class for drawing (un)satisfied requirements */ @@ -19,10 +21,17 @@ class ResultDelegate : public QStyledItemDelegate { public: using QStyledItemDelegate::QStyledItemDelegate; + ResultDelegate( QObject* parent, Calamares::RequirementsModel::Roles text ) + : QStyledItemDelegate( parent ) + , m_textRole( text ) + { + } protected: QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const override; void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const override; + + int m_textRole = Calamares::RequirementsModel::Name; }; #endif // PROGRESSTREEDELEGATE_H