Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 02:35:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #701 from jensenr30/fix-commit-highlighting

Browse Source 
Fix commit highlighting
This commit is contained in:
Murmele 2024-02-27 10:26:49 +01:00 committed by GitHub
commit 5d8091811d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ui/CommitList.cpp
View File

@ -635,9 +635,6 @@ public:
Settings::instance()->value(Setting::Id::ShowCommitsId, true).toBool();
LayoutConstants constants = layoutConstants(compact);
// Draw background.
QStyledItemDelegate::paint(painter, opt, index);
bool active = (opt.state & QStyle::State_Active);
bool selected = (opt.state & QStyle::State_Selected);
auto group = active ? QPalette::Active : QPalette::Inactive;
@ -646,10 +643,16 @@ public:
QPalette palette = Application::theme()->commitList();
QColor text = palette.color(group, textRole);
QColor bright = palette.color(group, brightRole);
QColor highlight = palette.color(group, QPalette::Highlight);
painter->save();
painter->setRenderHints(QPainter::Antialiasing);
// Draw background.
if (selected) {
painter->fillRect(opt.rect, highlight);
}
// Draw busy indicator.
if (opt.features & QStyleOptionViewItem::HasDecoration) {
QRect rect = decorationRect(option, index);
@ -784,7 +787,16 @@ public:
// Draw content.
git::Commit commit =
index.data(CommitList::Role::CommitRole).value<git::Commit>();
if (commit.isValid()) {
if (!commit.isValid()) {
// special case for uncommitted changes
QString message = index.model()->data(index).toString();
painter->save();
QFont italic = opt.font;
italic.setItalic(true);
painter->setFont(italic);
painter->drawText(opt.rect, Qt::AlignCenter, message);
painter->restore();
} else {
const QFontMetrics &fm = opt.fontMetrics;
QRect star = rect;