mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 05:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix palette usage in ActivityItemDelegate::paint()

Browse source 
Fixes #742.
This commit is contained in:
J-P Nurmi 2018-11-05 20:16:22 +01:00
parent 5a1fed8e23
commit b8d97b590f
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gui/activityitemdelegate.cpp
View file

@ -229,14 +229,13 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
// change pen color if use is not online // change pen color if use is not online
QPalette p = option.palette; QPalette p = option.palette;
if(!accountOnline) if(!accountOnline)
painter->setPen(p.color(QPalette::Disabled, QPalette::Text)); p.setCurrentColorGroup(QPalette::Disabled);
// change pen color if the line is selected // change pen color if the line is selected
QPalette::ColorGroup cg = option.state & (QStyle::State_Enabled | QStyle::State_Active) if (option.state & QStyle::State_Selected)
? QPalette::Normal painter->setPen(p.color(QPalette::HighlightedText));
: QPalette::Inactive; else
painter->setPen(p.color(QPalette::Text));
painter->setPen(option.palette.color(cg, QPalette::Text));
// calculate space for text - use the max possible before using the elipses // calculate space for text - use the max possible before using the elipses
int spaceLeftForText = option.rect.width() - (actionIconRect.width() + margin + rightMargin + leftMargin) - int spaceLeftForText = option.rect.width() - (actionIconRect.width() + margin + rightMargin + leftMargin) -
@ -262,11 +261,10 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
} }
// change pen color for the time // change pen color for the time
painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
// check if line is selected
if (option.state & QStyle::State_Selected) if (option.state & QStyle::State_Selected)
painter->setPen(option.palette.color(cg, QPalette::HighlightedText)); painter->setPen(p.color(QPalette::Disabled, QPalette::HighlightedText));
else
painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
// draw the time // draw the time
const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, spaceLeftForText); const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, spaceLeftForText);