diff --git a/src/PropListDelegate.h b/src/PropListDelegate.h index 6dbaa96fe..b1344f2d9 100644 --- a/src/PropListDelegate.h +++ b/src/PropListDelegate.h @@ -57,40 +57,13 @@ class PropListDelegate: public QItemDelegate { ~PropListDelegate(){} void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const{ - QStyleOptionViewItem opt = option; char tmp[MAX_CHAR_TMP]; - // set text color - QVariant value = index.data(Qt::ForegroundRole); - if (value.isValid() && qvariant_cast(value).isValid()){ - opt.palette.setColor(QPalette::Text, qvariant_cast(value)); - } - QPalette::ColorGroup cg = option.state & QStyle::State_Enabled - ? QPalette::Normal : QPalette::Disabled; - if (option.state & QStyle::State_Selected){ - painter->setPen(opt.palette.color(cg, QPalette::HighlightedText)); - }else{ - painter->setPen(opt.palette.color(cg, QPalette::Text)); - } - // draw the background color - if(index.column() != PROGRESS){ - if (option.showDecorationSelected && (option.state & QStyle::State_Selected)){ - if (cg == QPalette::Normal && !(option.state & QStyle::State_Active)){ - cg = QPalette::Inactive; - } - painter->fillRect(option.rect, option.palette.brush(cg, QPalette::Highlight)); - }else{ - value = index.data(Qt::BackgroundColorRole); - if (value.isValid() && qvariant_cast(value).isValid()){ - painter->fillRect(option.rect, qvariant_cast(value)); - } - } - } + QStyleOptionViewItemV3 opt = QItemDelegate::setOptions(index, option); + QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled; switch(index.column()){ case SIZE: - painter->drawText(option.rect, Qt::AlignCenter, misc::friendlyUnit(index.data().toLongLong())); - break; - case NAME: - painter->drawText(option.rect, Qt::AlignLeft, index.data().toString()); + QItemDelegate::drawBackground(painter, opt, index); + QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong())); break; case PROGRESS:{ QStyleOptionProgressBarV2 newopt; @@ -142,7 +115,7 @@ class PropListDelegate: public QItemDelegate { break; } default: - painter->drawText(option.rect, Qt::AlignCenter, index.data().toString()); + QItemDelegate::paint(painter, option, index); } }