void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-16 14:17:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed duplicated search of correspond chat filter for tags in dialogs.

Browse source
This commit is contained in:
23rd 2024-11-21 13:56:13 +03:00
parent 9d5ca1252a
commit b335981621
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View file

@ -809,7 +809,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
// Hack for History::fakeUnreadWhileOpened().
continue;
}
if (const auto tag = cacheChatsFilterTag(filter.id(), 0, a)) {
if (const auto tag = cacheChatsFilterTag(filter, 0, a)) {
if (more) {
more++;
continue;
@ -826,13 +826,13 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
}
}
if (more) {
if (const auto tag = cacheChatsFilterTag(0, more, a)) {
if (const auto tag = cacheChatsFilterTag({}, more, a)) {
const auto tagWidth = tag->width()
/ style::DevicePixelRatio();
if (availableWidth < tagWidth) {
more++;
if (!chatsFilterTags.empty()) {
const auto tag = cacheChatsFilterTag(0, more, a);
const auto tag = cacheChatsFilterTag({}, more, a);
if (tag) {
chatsFilterTags.back() = tag;
}
@ -4089,13 +4089,13 @@ void InnerWidget::restoreChatsFilterScrollState(FilterId filterId) {
}
QImage *InnerWidget::cacheChatsFilterTag(
FilterId filterId,
const Data::ChatFilter &filter,
uint8 more,
bool active) {
if (!filterId && !more) {
if (!filter.id() && !more) {
return nullptr;
}
const auto key = SerializeFilterTagsKey(filterId, more, active);
const auto key = SerializeFilterTagsKey(filter.id(), more, active);
{
const auto it = _chatsFilterTags.find(key);
if (it != end(_chatsFilterTags)) {
@ -4104,14 +4104,10 @@ QImage *InnerWidget::cacheChatsFilterTag(
}
auto roundedText = QString();
auto colorIndex = -1;
if (filterId) {
const auto &list = session().data().chatsFilters().list();
const auto it = ranges::find(list, filterId, &Data::ChatFilter::id);
if (it != end(list)) {
roundedText = it->title().toUpper();
if (it->colorIndex()) {
colorIndex = *it->colorIndex();
}
if (filter.id()) {
roundedText = filter.title().toUpper();
if (filter.colorIndex()) {
colorIndex = *(filter.colorIndex());
}
} else if (more > 0) {
roundedText = QChar('+') + QString::number(more);

6
Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
View file

@ -41,6 +41,7 @@ class SessionController;
} // namespace Window
namespace Data {
class ChatFilter;
class Thread;
class Folder;
class Forum;
@ -450,7 +451,10 @@ private:
void saveChatsFilterScrollState(FilterId filterId);
void restoreChatsFilterScrollState(FilterId filterId);
[[nodiscard]] QImage *cacheChatsFilterTag(FilterId, uint8, bool);
[[nodiscard]] QImage *cacheChatsFilterTag(
const Data::ChatFilter &filter,
uint8 more,
bool active);
const not_null<Window::SessionController*> _controller;