Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Paint the second line of search results in the same colour, increase spacing slightly

This commit is contained in:
David Sansome 2011-09-17 15:24:46 +01:00
parent 9596377de1
commit 401700822d
2 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/globalsearch/globalsearchitemdelegate.cpp
View File

@ -23,9 +23,8 @@
const int GlobalSearchItemDelegate::kHeight = SearchProvider::kArtHeight;
const int GlobalSearchItemDelegate::kMargin = 1;
const int GlobalSearchItemDelegate::kMargin = 2;
const int GlobalSearchItemDelegate::kArtMargin = 6;
const int GlobalSearchItemDelegate::kWordPadding = 6;
GlobalSearchItemDelegate::GlobalSearchItemDelegate(GlobalSearchWidget* widget)
: QStyledItemDelegate(widget),
@ -41,13 +40,6 @@ QSize GlobalSearchItemDelegate::sizeHint(const QStyleOptionViewItem& option,
return size;
}
void GlobalSearchItemDelegate::DrawAndShrink(QPainter* p, QRect* rect,
const QString& text) const {
QRect br;
p->drawText(*rect, Qt::TextSingleLine | Qt::AlignVCenter, text, &br);
rect->setLeft(br.right() + kWordPadding);
}
void GlobalSearchItemDelegate::paint(QPainter* p,
const QStyleOptionViewItem& option,
const QModelIndex& index) const {
@ -88,44 +80,28 @@ void GlobalSearchItemDelegate::paint(QPainter* p,
QRect text_rect_1(text_rect.adjusted(0, 0, 0, -kHeight/2));
QRect text_rect_2(text_rect.adjusted(0, kHeight/2, 0, 0));
QString line_1;
QString line_2;
// The text we draw depends on the type of result.
switch (result.type_) {
case SearchProvider::Result::Type_Track: {
// Line 1 is Title
p->setFont(bold_font);
// Title
p->setPen(pen);
DrawAndShrink(p, &text_rect_1, m.title());
line_1 += m.title() + " ";
// Line 2 is Artist - Album - Track n
p->setFont(option.font);
// Artist
p->setPen(pen);
// Artist - Album - Track n
if (!m.artist().isEmpty()) {
DrawAndShrink(p, &text_rect_2, m.artist());
line_2 += m.artist();
} else if (!m.albumartist().isEmpty()) {
DrawAndShrink(p, &text_rect_2, m.albumartist());
line_2 += m.albumartist();
}
if (!m.album().isEmpty()) {
// Dash
p->setPen(light_pen);
DrawAndShrink(p, &text_rect_2, " - ");
// Album
p->setPen(pen);
DrawAndShrink(p, &text_rect_2, m.album());
line_2 += " - " + m.album();
}
if (m.track() > 0) {
// Dash
p->setPen(light_pen);
DrawAndShrink(p, &text_rect_2, " - ");
// Album
DrawAndShrink(p, &text_rect_2, tr("track %1").arg(m.track()));
line_2 += " - " + tr("track %1").arg(m.track());
}
break;
@ -133,39 +109,37 @@ void GlobalSearchItemDelegate::paint(QPainter* p,
case SearchProvider::Result::Type_Album: {
// Line 1 is Artist - Album
p->setFont(bold_font);
// Artist
p->setPen(pen);
if (!m.albumartist().isEmpty())
DrawAndShrink(p, &text_rect_1, m.albumartist());
line_1 += m.albumartist();
else if (m.is_compilation())
DrawAndShrink(p, &text_rect_1, tr("Various Artists"));
line_1 += tr("Various Artists");
else if (!m.artist().isEmpty())
DrawAndShrink(p, &text_rect_1, m.artist());
line_1 += m.artist();
else
DrawAndShrink(p, &text_rect_1, tr("Unknown"));
line_1 += tr("Unknown");
// Dash
p->setPen(light_pen);
DrawAndShrink(p, &text_rect_1, " - ");
line_1 += " - ";
// Album
p->setPen(pen);
if (m.album().isEmpty())
DrawAndShrink(p, &text_rect_1, tr("Unknown"));
line_1 += tr("Unknown");
else
DrawAndShrink(p, &text_rect_1, m.album());
line_1 += m.album();
// Line 2 is <n> tracks
p->setFont(option.font);
p->setPen(pen);
DrawAndShrink(p, &text_rect_2, QString::number(result.album_size_));
p->setPen(light_pen);
DrawAndShrink(p, &text_rect_2, tr(result.album_size_ == 1 ? "track" : "tracks"));
line_2 += QString::number(result.album_size_) + " ";
line_2 += tr(result.album_size_ == 1 ? "track" : "tracks");
break;
}
}
p->setFont(bold_font);
p->setPen(pen);
p->drawText(text_rect_1, Qt::TextSingleLine | Qt::AlignVCenter, line_1);
p->setFont(option.font);
p->setPen(light_pen);
p->drawText(text_rect_2, Qt::TextSingleLine | Qt::AlignVCenter, line_2);
}

4
src/globalsearch/globalsearchitemdelegate.h
View File

@ -30,15 +30,11 @@ public:
static const int kHeight;
static const int kMargin;
static const int kArtMargin;
static const int kWordPadding;
QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const;
void paint(QPainter* painter, const QStyleOptionViewItem& option,
const QModelIndex& index) const;
private:
void DrawAndShrink(QPainter* p, QRect* rect, const QString& text) const;
private:
GlobalSearchWidget* widget_;
QPixmap no_cover_;