From be8aeb0d96bacc6dc911fea9a2d8d47e10c35bf7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 Dec 2022 10:26:22 +0400 Subject: [PATCH] Fix week name display in chats list. Fixes #25625. --- Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp index a73231003e..81939e8f32 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp @@ -89,12 +89,10 @@ void PaintRowDate( const auto lastDate = lastTime.date(); const auto dt = [&] { - const auto wasSameDay = (lastDate == nowDate); - const auto wasRecently = qAbs(lastTime.secsTo(now)) < kRecentlyInSeconds; - if (wasSameDay || wasRecently) { + if ((lastDate == nowDate) + || (qAbs(lastTime.secsTo(now)) < kRecentlyInSeconds)) { return QLocale().toString(lastTime.time(), QLocale::ShortFormat); - } else if (lastDate.year() == nowDate.year() - && lastDate.weekNumber() == nowDate.weekNumber()) { + } else if (qAbs(lastDate.daysTo(nowDate)) < 7) { return langDayOfWeek(lastDate); } else { return QLocale().toString(lastDate, QLocale::ShortFormat);