The_Great_Archive/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-09-12 19:50:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3292 from jolavillette/fix/eliditemdelegate-font-inherit

Browse Source 
gui: let RSElidedItemDelegate inherit the view font from the model font
This commit is contained in:
csoler 2026-08-28 11:14:46 +02:00 committed by GitHub
commit 5bbe63e4d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-gui/src/gui/common/RSElidedItemDelegate.cpp
View File

@ -137,9 +137,13 @@ void RSElidedItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
td.setHtml(ownOption.text);
ownOption.text = td.toPlainText();
}
// Get Font as option.font is not accurate
// Get Font as option.font is not accurate. Merge it into the font of the view instead
// of replacing it: a font stored in the model usually only sets a couple of attributes
// (bold, italic) and expects the rest (family, size) to be inherited from the view.
// QFont::resolve() keeps exactly what the model really set and takes the rest from the
// view, which is what QStyledItemDelegate::initStyleOption() does as well.
if (index.data(Qt::FontRole).type() == QVariant::Font) {
QFont font = index.data(Qt::FontRole).value<QFont>();
QFont font = index.data(Qt::FontRole).value<QFont>().resolve(ownOption.font);
ownOption.font = font;
ownOption.fontMetrics = QFontMetrics(font);
#ifdef DEBUG_EID_PAINT
@ -421,9 +425,9 @@ bool RSElidedItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
td.setHtml(ownOption.text);
ownOption.text = td.toPlainText();
}
//Get Font as option.font is not accurate
//Get Font as option.font is not accurate, merged into the one of the view (see paint())
if (index.data(Qt::FontRole).type() == QVariant::Font) {
QFont font = index.data(Qt::FontRole).value<QFont>();
QFont font = index.data(Qt::FontRole).value<QFont>().resolve(ownOption.font);
ownOption.font = font;
ownOption.fontMetrics = QFontMetrics(font);
}