Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

[LocationCompleter] Correctly elide text also fixed compile on Qt5.

Browse Source
This commit is contained in:
S. Razi Alavizadeh 2014-06-06 07:00:30 +04:30
parent 877266b418
commit 5a183a1a8d
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,15 +212,18 @@ static QSizeF viewItemTextLayout(QTextLayout &textLayout, int lineWidth)
void LocationCompleterDelegate::viewItemDrawText(QPainter *p, const QStyleOptionViewItemV4 *option, const QRect &rect, void LocationCompleterDelegate::viewItemDrawText(QPainter *p, const QStyleOptionViewItemV4 *option, const QRect &rect,
const QString &text, const QPalette::ColorRole &role, const QString &searchText) const const QString &text, const QPalette::ColorRole &role, const QString &searchText) const
{ {
if (text.isEmpty()) {
return;
}
const QColor &color = option->palette.color(role); const QColor &color = option->palette.color(role);
const QWidget *widget = option->widget; const QWidget* widget = option->widget;
const QStyle* proxyStyle = widget ? widget->style()->proxy() : QApplication::style()->proxy(); const QStyle* proxyStyle = widget ? widget->style()->proxy() : QApplication::style()->proxy();
const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, widget) + 1; const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, widget) + 1;
QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
const QFontMetrics &fontMetrics(p->font()); const QFontMetrics fontMetrics(p->font());
// a workaround for not drawing highlighted text on icon QString elidedText = fontMetrics.elidedText(text, option->textElideMode, textRect.width());
const QString &elidedText = fontMetrics.elidedText(text, option->textElideMode, textRect.width() - 2 * m_padding - 2);
QTextOption textOption; QTextOption textOption;
textOption.setWrapMode(QTextOption::NoWrap); textOption.setWrapMode(QTextOption::NoWrap);
textOption.setTextDirection(text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight); textOption.setTextDirection(text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight);
@ -298,15 +301,33 @@ void LocationCompleterDelegate::viewItemDrawText(QPainter *p, const QStyleOption
// do layout // do layout
viewItemTextLayout(textLayout, textRect.width()); viewItemTextLayout(textLayout, textRect.width());
if (textLayout.lineCount() <= 0) {
return;
}
QTextLine textLine = textLayout.lineAt(0);
// if elidedText after highlighting is longer
// than available width then re-elide it and redo layout
int diff = textLine.naturalTextWidth() - textRect.width();
if (diff > 0) {
elidedText = fontMetrics.elidedText(elidedText, option->textElideMode, textRect.width() - diff);
textLayout.setText(elidedText);
// redo layout
viewItemTextLayout(textLayout, textRect.width());
if (textLayout.lineCount() <= 0) {
return;
}
textLine = textLayout.lineAt(0);
}
// draw line // draw line
p->setPen(color); p->setPen(color);
const int lineCount = textLayout.lineCount(); qreal width = qMax<qreal>(textRect.width(), textLayout.lineAt(0).width());
if (lineCount > 0) { const QRect &layoutRect = QStyle::alignedRect(option->direction, option->displayAlignment, QSize(int(width), int(textLine.height())), textRect);
qreal height = textLayout.lineAt(0).height(); const QPointF &position = layoutRect.topLeft();
qreal width = qMax<qreal>(textRect.width(), textLayout.lineAt(0).width());
const QRect &layoutRect = QStyle::alignedRect(option->direction, option->displayAlignment, QSize(int(width), int(height)), textRect);
const QPointF &position = layoutRect.topLeft();
textLayout.lineAt(0).draw(p, position); textLine.draw(p, position);
}
} }