diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index 7e27ab419..8df32991b 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -407,9 +407,6 @@ dialogsLockIcon: ThreeStateIcon { active: icon {{ "emoji/premium_lock", dialogsUnreadBgMutedActive, point(4px, 0px) }}; } -dialogsVerifiedBg: icon{{ "dialogs/dialogs_verified_star", dialogsVerifiedIconBg }}; -dialogsVerifiedFg: icon{{ "dialogs/dialogs_verified_check", dialogsVerifiedIconFg }}; -dialogsVerifiedPadding: margins(0px, 3px, 0px, 0px); dialogsVerifiedColors: VerifiedBadge { height: 20px; bg: dialogsVerifiedIconBg; diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index 44ef4f6a6..4d9e013f4 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -1390,6 +1390,11 @@ void InnerWidget::paintPeerSearchResult( const auto position = rectForName.topLeft(); const auto skip = result->badge.drawVerified(p, position, st); rectForName.setLeft(position.x() + skip + st::dialogsChatTypeSkip); + } else if (const auto chatTypeIcon = Ui::ChatTypeIcon(peer, context)) { + chatTypeIcon->paint(p, rectForName.topLeft(), context.width); + rectForName.setLeft(rectForName.left() + + chatTypeIcon->width() + + st::dialogsChatTypeSkip); } const auto badgeWidth = result->badge.drawGetWidth( p, diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp index e4243c7ae..05d4b417d 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp @@ -460,6 +460,13 @@ void PaintRow( const auto position = rectForName.topLeft(); const auto skip = rowBadge.drawVerified(p, position, st); rectForName.setLeft(position.x() + skip + st::dialogsChatTypeSkip); + } else if (from) { + if (const auto chatTypeIcon = ChatTypeIcon(from, context)) { + chatTypeIcon->paint(p, rectForName.topLeft(), context.width); + rectForName.setLeft(rectForName.left() + + chatTypeIcon->width() + + st::dialogsChatTypeSkip); + } } auto texttop = context.st->textTop; if (const auto folder = entry->asFolder()) {