Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

LocationCompleterDelegate: Use smaller font for link text

Browse Source 
Instead of using bigger font for title, use normal font size
for title and smaller font for link.
This commit is contained in:
David Rosca 2018-01-25 09:22:17 +01:00
parent 93ff0c324c
commit b0c2a09f94
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/navigation/completer/locationcompleterdelegate.cpp
View File

@ -63,11 +63,11 @@ void LocationCompleterDelegate::paint(QPainter* painter, const QStyleOptionViewI
const int height = opt.rect.height(); const int height = opt.rect.height();
const int center = height / 2 + opt.rect.top(); const int center = height / 2 + opt.rect.top();
// Prepare title font // Prepare link font
QFont titleFont = opt.font; QFont linkFont = opt.font;
titleFont.setPointSize(titleFont.pointSize() + 1); linkFont.setPointSize(linkFont.pointSize() - 1);
const QFontMetrics titleMetrics(titleFont); const QFontMetrics linkMetrics(linkFont);
int leftPosition = m_padding * 2; int leftPosition = m_padding * 2;
int rightPosition = opt.rect.right() - m_padding; int rightPosition = opt.rect.right() - m_padding;
@ -123,9 +123,9 @@ void LocationCompleterDelegate::paint(QPainter* painter, const QStyleOptionViewI
// Draw title // Draw title
leftPosition += 2; leftPosition += 2;
QRect titleRect(leftPosition, center - titleMetrics.height() / 2, opt.rect.width() * 0.6, titleMetrics.height()); QRect titleRect(leftPosition, center - opt.fontMetrics.height() / 2, opt.rect.width() * 0.6, opt.fontMetrics.height());
QString title = index.data(LocationCompleterModel::TitleRole).toString(); QString title = index.data(LocationCompleterModel::TitleRole).toString();
painter->setFont(titleFont); painter->setFont(opt.font);
if (isVisitSearchItem) { if (isVisitSearchItem) {
title = m_originalText.trimmed(); title = m_originalText.trimmed();
@ -169,7 +169,7 @@ void LocationCompleterDelegate::paint(QPainter* painter, const QStyleOptionViewI
// Draw separator // Draw separator
if (!link.isEmpty()) { if (!link.isEmpty()) {
QChar separator = QL1C('-'); QChar separator = QL1C('-');
QRect separatorRect(leftPosition, center - titleMetrics.height() / 2, titleMetrics.width(separator), titleMetrics.height()); QRect separatorRect(leftPosition, center - linkMetrics.height() / 2, linkMetrics.width(separator), linkMetrics.height());
style->drawItemText(painter, separatorRect, Qt::AlignCenter, textPalette, true, separator, colorRole); style->drawItemText(painter, separatorRect, Qt::AlignCenter, textPalette, true, separator, colorRole);
leftPosition += separatorRect.width() + m_padding * 2; leftPosition += separatorRect.width() + m_padding * 2;
} }
@ -177,8 +177,8 @@ void LocationCompleterDelegate::paint(QPainter* painter, const QStyleOptionViewI
// Draw link // Draw link
const int leftLinkEdge = leftPosition; const int leftLinkEdge = leftPosition;
const int rightLinkEdge = rightPosition - m_padding - starPixmapWidth; const int rightLinkEdge = rightPosition - m_padding - starPixmapWidth;
QRect linkRect(leftLinkEdge, center - opt.fontMetrics.height() / 2, rightLinkEdge - leftLinkEdge, opt.fontMetrics.height()); QRect linkRect(leftLinkEdge, center - linkMetrics.height() / 2, rightLinkEdge - leftLinkEdge, linkMetrics.height());
painter->setFont(opt.font); painter->setFont(linkFont);
// Draw url (or switch to tab) // Draw url (or switch to tab)
int tabPos = index.data(LocationCompleterModel::TabPositionTabRole).toInt(); int tabPos = index.data(LocationCompleterModel::TabPositionTabRole).toInt();
@ -218,14 +218,8 @@ QSize LocationCompleterDelegate::sizeHint(const QStyleOptionViewItem &option, co
const QStyle* style = w ? w->style() : QApplication::style(); const QStyle* style = w ? w->style() : QApplication::style();
const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0) + 1; const int padding = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0) + 1;
QFont titleFont = opt.font;
titleFont.setPointSize(titleFont.pointSize() + 1);
m_padding = padding > 3 ? padding : 3; m_padding = padding > 3 ? padding : 3;
m_rowHeight = 4 * m_padding + qMax(16, opt.fontMetrics.height());
const QFontMetrics titleMetrics(titleFont);
m_rowHeight = 4 * m_padding + qMax(16, titleMetrics.height());
} }
return QSize(200, m_rowHeight); return QSize(200, m_rowHeight);