diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/carddelegate.cpp | 44 | ||||
| -rw-r--r-- | src/carddelegate.h | 26 | ||||
| -rw-r--r-- | src/cardlayout.cpp | 11 |
3 files changed, 56 insertions, 25 deletions
diff --git a/src/carddelegate.cpp b/src/carddelegate.cpp index bc03b5a..a3a846d 100644 --- a/src/carddelegate.cpp +++ b/src/carddelegate.cpp @@ -53,15 +53,21 @@ QColor CardDelegate::accentLineColour(const QColor &accountColour) if (!accountColour.isValid()) return ThreadListModel::threadLineColour(); - // The same 0.35 weight threadLineColour() uses, toward Base rather than - // toward Text, so the two kinds of line sit at the same visual strength. - const QColor base = QGuiApplication::palette().color(QPalette::Base); - constexpr qreal kWeight = 0.35; - const qreal inverse = 1.0 - kWeight; - return QColor::fromRgbF( - accountColour.redF() * kWeight + base.redF() * inverse, - accountColour.greenF() * kWeight + base.greenF() * inverse, - accountColour.blueF() * kWeight + base.blueF() * inverse); + // 0.35 toward Base was the first attempt and produced an INVISIBLE bar on + // a dark theme: rendered against a Base of (0.169, 0.169, 0.169) it landed + // at (0.18, 0.22, 0.26), which is the background. The weight is a fraction + // OF THE ACCOUNT COLOUR, so a low one keeps the background, not the hue. + // + // The bar is the account's colour, undiluted. Blending it toward Base at + // all was the mistake: a chip's colour is chosen to carry text on top and + // is therefore already muted, and three pixels of a muted colour on a dark + // background is nothing at all. There is no text on this bar, so nothing + // needs the contrast a chip's fill was picked for. + // + // What DOES step back is the spine, below: a line running the height of a + // whole expansion has to be followable without competing with the senders + // beside it, which is a different problem from a 3px edge marker. + return accountColour; } QSize CardDelegate::sizeHint(const QStyleOptionViewItem &option, @@ -110,10 +116,22 @@ void CardDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, if (!card.accentRect.isEmpty()) painter->fillRect(card.accentRect, lineColour); - // Spines, under everything else, in the same accent so an expanded thread - // is bounded by one colour from its root to its last reply. - for (const QRect &spine : card.spines) - painter->fillRect(spine, lineColour); + // Spines, under everything else, in the account's hue so an expanded thread + // is bounded by one colour from its root to its last reply. Muted against + // the pane's own background, unlike the accent bar: this line runs the full + // height of every reply and at full strength it shouts. + if (!card.spines.isEmpty()) { + const QColor base = + QGuiApplication::palette().color(QPalette::Base); + constexpr qreal kSpineWeight = 0.55; + const qreal inverse = 1.0 - kSpineWeight; + const QColor spineColour = QColor::fromRgbF( + lineColour.redF() * kSpineWeight + base.redF() * inverse, + lineColour.greenF() * kSpineWeight + base.greenF() * inverse, + lineColour.blueF() * kSpineWeight + base.blueF() * inverse); + for (const QRect &spine : card.spines) + painter->fillRect(spine, spineColour); + } // Selection outranks the model's foreground, and the order matters: a read // card carries a dimmed colour blended against the UNSELECTED background, diff --git a/src/carddelegate.h b/src/carddelegate.h index 317c78a..7012eaa 100644 --- a/src/carddelegate.h +++ b/src/carddelegate.h @@ -52,17 +52,21 @@ public: static QRect expanderRectFor(const QStyleOptionViewItem &option, const QModelIndex &index); - /// An account's colour as a thin LINE rather than as a chip's fill. + /// The colour the accent bar is painted in: the account's own, undiluted. /// - /// Never use the raw account colour for the accent bar or the spine. That - /// colour is chosen to be a background with legible text drawn on top - /// (TagColors::textColourOn picks black or white against it). The same - /// colour as a few pixels of line on the pane's own background is a - /// different problem: it has to be followable down a long expansion - /// WITHOUT competing with the senders beside it, which is the constraint - /// threadLineColour() states and meets by blending 0.35 toward the - /// palette's text. This blends the account colour toward the palette's - /// Base by the same weight, keeping the hue that identifies the account - /// and dropping the saturation that would shout. + /// Blending it toward the palette's Base was tried first, at the 0.35 + /// weight threadLineColour() uses, and produced an INVISIBLE bar on a dark + /// theme: against a Base of (0.169, 0.169, 0.169) it landed at (0.18, 0.22, + /// 0.26), which is the background. The weight is a fraction OF THE ACCOUNT + /// COLOUR, so a low one keeps the background rather than the hue. + /// + /// An account colour is already chosen to be a chip's fill with legible + /// text on top, so it is muted to begin with; three pixels of a muted + /// colour is nothing. Nothing is drawn on this bar, so it needs none of the + /// contrast that choice was made for. The SPINE is where the muting belongs + /// and is blended in paint(): it runs the full height of every reply in an + /// expansion and has to be followable without competing with the senders. + /// + /// Falls back to threadLineColour() for a thread with no account tag. static QColor accentLineColour(const QColor &accountColour); }; diff --git a/src/cardlayout.cpp b/src/cardlayout.cpp index 8d952b2..1a79e3b 100644 --- a/src/cardlayout.cpp +++ b/src/cardlayout.cpp @@ -87,7 +87,16 @@ CardLayout CardLayout::compute(const Input &input, const QRect &rect, // The date is measured first and the sender gets what is left, so a long // sender is elided rather than painting over the date. - const int dateWidth = metrics.horizontalAdvance( + // + // Measured BOLD whatever font this is handed. An unread card draws bold and + // the delegate computes its layout from the view's regular font, so a rect + // sized regular clips a bold date: 154px reserved against 170px needed, one + // digit of the year gone from every unread card. Reserving the wider of the + // two costs a few pixels on a read card and cannot disagree with what is + // painted. + QFont dateFont = font; + dateFont.setBold(true); + const int dateWidth = QFontMetrics(dateFont).horizontalAdvance( QStringLiteral("8888-88-88 88:88")); out.dateRect = QRect(right - dateWidth, lineOneTop, dateWidth, metrics.height()); |