mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 09:05:14 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'tdesktop/dev' into dev

Browse Source
This commit is contained in:
RadRussianRus
2020-03-28 05:05:42 +03:00
parent a2ee066fc5 deb76f38d7
commit 9ed04afee8
334 changed files with 6707 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Telegram/SourceFiles/dialogs/dialogs_layout.cpp
View File

@@ -223,6 +223,7 @@ void paintOneLineRow(
not_null<const BasicRow*> row,
not_null<Entry*> entry,
Dialogs::Key chat,
FilterId filterId,
PeerData *from,
const HiddenSenderInfo *hiddenSenderInfo,
HistoryItem *item,
@@ -321,7 +322,7 @@ void paintOneLineRow(
&& !item->isEmpty()) {
const auto nameWithoutCounterWidth = paintItemCallback(nameleft, (flags & Flag::SearchResult ? namewidth : rectForName.width()));
rectForName.setWidth(nameWithoutCounterWidth - st::dialogsPadding.x());
} else if (entry->isPinnedDialog() && !entry->fixedOnTopIndex()) {
} else if (entry->isPinnedDialog(filterId) && (filterId || !entry->fixedOnTopIndex())) {
auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), st::dialogsPadding.y(), fullWidth);
rectForName.setWidth(rectForName.width() - icon.width() - st::dialogsUnreadPadding);
@@ -391,6 +392,7 @@ void paintRow(
not_null<const BasicRow*> row,
not_null<Entry*> entry,
Dialogs::Key chat,
FilterId filterId,
PeerData *from,
const HiddenSenderInfo *hiddenSenderInfo,
HistoryItem *item,
@@ -495,7 +497,7 @@ void paintRow(
}
auto availableWidth = namewidth;
if (entry->isPinnedDialog() && !entry->fixedOnTopIndex()) {
if (entry->isPinnedDialog(filterId) && (filterId || !entry->fixedOnTopIndex())) {
auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
availableWidth -= icon.width() + st::dialogsUnreadPadding;
@@ -522,7 +524,7 @@ void paintRow(
}
} else if (!item) {
auto availableWidth = namewidth;
if (entry->isPinnedDialog() && !entry->fixedOnTopIndex()) {
if (entry->isPinnedDialog(filterId) && (filterId || !entry->fixedOnTopIndex())) {
auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
availableWidth -= icon.width() + st::dialogsUnreadPadding;
@@ -539,7 +541,7 @@ void paintRow(
}
paintItemCallback(nameleft, namewidth);
} else if (entry->isPinnedDialog() && !entry->fixedOnTopIndex()) {
} else if (entry->isPinnedDialog(filterId) && (filterId || !entry->fixedOnTopIndex())) {
auto availableWidth = namewidth;
auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
@@ -792,6 +794,7 @@ void paintUnreadCount(
void RowPainter::paint(
Painter &p,
not_null<const Row*> row,
FilterId filterId,
int fullWidth,
bool active,
bool selected,
@@ -851,8 +854,8 @@ void RowPainter::paint(
const auto displayPinnedIcon = !displayUnreadCounter
&& !displayMentionBadge
&& !displayUnreadMark
&& entry->isPinnedDialog()
&& !entry->fixedOnTopIndex();
&& entry->isPinnedDialog(filterId)
&& (filterId || !entry->fixedOnTopIndex());
const auto from = history
? (history->peer->migrateTo()
@@ -939,6 +942,7 @@ void RowPainter::paint(
row,
entry,
row->key(),
filterId,
from,
nullptr,
item,
@@ -955,6 +959,7 @@ void RowPainter::paint(
row,
entry,
row->key(),
filterId,
from,
nullptr,
item,
@@ -1086,6 +1091,7 @@ void RowPainter::paint(
row,
history,
history,
FilterId(),
from,
hiddenSenderInfo,
item,
@@ -1102,6 +1108,7 @@ void RowPainter::paint(
row,
history,
history,
FilterId(),
from,
hiddenSenderInfo,
item,