Merge remote-tracking branch 'origin/7.0'

Conflicts:
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp

Change-Id: Icda34067bb89d066a3e7eb47f8cca1d62dc3ae0d
This commit is contained in:
Eike Ziller
2022-02-11 10:54:46 +01:00
397 changed files with 12877 additions and 4994 deletions

View File

@@ -525,11 +525,14 @@ void ListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
painter->setPen(themeColor(Theme::Welcome_LinkColor));
m_currentTagRects.clear();
int emptyTagRowsLeft = 2;
int xx = 0;
int yy = 0;
for (const QString &tag : item->tags) {
const int ww = fm.horizontalAdvance(tag) + tagsHorSpacing;
if (xx + ww > textArea.width() - tagsLabelRect.width()) {
if (--emptyTagRowsLeft == 0)
break;
yy += fm.lineSpacing();
xx = 0;
}