From 175968c3c096c48d1fc003448d519ba39755401a Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 27 Feb 2016 14:44:47 +0300 Subject: [PATCH] active muted unread count uses different color --- Telegram/Resources/style.txt | 1 + Telegram/SourceFiles/history.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index 015fb86da..8d9dd68e6 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -955,6 +955,7 @@ dlgActiveUnreadColor: #5b94bf; dlgActiveUnreadBG: white; dlgActiveColor: white; dlgActiveDateColor: #d3e2ee; +dlgActiveUnreadMutedBG: dlgActiveDateColor; topBarHeight: 54px; topBarBG: white; diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 3dd6a40d1..4dd68f6bf 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -175,7 +175,7 @@ void DialogRow::paint(Painter &p, int32 w, bool act, bool sel, bool onlyBackgrou int32 unreadRectLeft = w - st::dlgPaddingHor - unreadRectWidth; int32 unreadRectTop = st::dlgHeight - st::dlgPaddingVer - unreadRectHeight; lastWidth -= unreadRectWidth + st::dlgUnreadPaddingHor; - p.setBrush((act ? st::dlgActiveUnreadBG : (history->mute ? st::dlgUnreadMutedBG : st::dlgUnreadBG))->b); + p.setBrush((act ? (history->mute ? st::dlgActiveUnreadMutedBG : st::dlgActiveUnreadBG) : (history->mute ? st::dlgUnreadMutedBG : st::dlgUnreadBG))->b); p.setPen(Qt::NoPen); p.drawRoundedRect(unreadRectLeft, unreadRectTop, unreadRectWidth, unreadRectHeight, st::dlgUnreadRadius, st::dlgUnreadRadius); p.setFont(st::dlgUnreadFont->f);