From 27063167ae3d3815d47038dc9cbed4a7a1219e56 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 Aug 2022 10:34:06 +0300
Subject: [PATCH] Don't cut name / status unnecessary.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp | 41 +++++++++++++-------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index e40d99cdf1..bbc6641bbf 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1567,34 +1567,49 @@ crl::time PeerListContent::paintRow(
 
 	p.setPen(st::contactsNameFg);
 
-	auto skipRight = _st.item.photoPosition.x();
-	auto rightActionSize = row->rightActionSize();
-	auto rightActionMargins = rightActionSize.isEmpty()
+	const auto skipRight = _st.item.photoPosition.x();
+	const auto rightActionSize = row->rightActionSize();
+	const auto rightActionMargins = rightActionSize.isEmpty()
 		? QMargins()
 		: row->rightActionMargins();
-	auto &name = row->name();
-	auto namex = _st.item.namePosition.x();
+	const auto &name = row->name();
+	const auto namex = _st.item.namePosition.x();
+	const auto namey = _st.item.namePosition.y();
 	auto namew = outerWidth - namex - skipRight;
-	if (!rightActionSize.isEmpty()) {
+	if (!rightActionSize.isEmpty()
+		&& (namey < rightActionMargins.top() + rightActionSize.height())
+		&& (namey + _st.item.nameStyle.font->height
+			> rightActionMargins.top())) {
 		namew -= rightActionMargins.left()
 			+ rightActionSize.width()
 			+ rightActionMargins.right()
 			- skipRight;
 	}
-	auto statusw = namew;
+	const auto statusx = _st.item.statusPosition.x();
+	const auto statusy = _st.item.statusPosition.y();
+	auto statusw = outerWidth - statusx - skipRight;
+	if (!rightActionSize.isEmpty()
+		&& (statusy < rightActionMargins.top() + rightActionSize.height())
+		&& (statusy + st::contactsStatusFont->height
+			> rightActionMargins.top())) {
+		statusw -= rightActionMargins.left()
+			+ rightActionSize.width()
+			+ rightActionMargins.right()
+			- skipRight;
+	}
 	namew -= row->paintNameIconGetWidth(
 		p,
 		[=] { updateRow(row); },
 		now,
 		namex,
-		_st.item.namePosition.y(),
+		namey,
 		name.maxWidth(),
 		namew,
 		width(),
 		selected);
 	auto nameCheckedRatio = row->disabled() ? 0. : row->checkedRatio();
 	p.setPen(anim::pen(_st.item.nameFg, _st.item.nameFgChecked, nameCheckedRatio));
-	name.drawLeftElided(p, namex, _st.item.namePosition.y(), namew, width());
+	name.drawLeftElided(p, namex, namey, namew, width());
 
 	p.setFont(st::contactsStatusFont);
 	if (row->isSearchResult()
@@ -1613,16 +1628,16 @@ crl::time PeerListContent::paintRow(
 				highlightedPart = st::contactsStatusFont->elided(highlightedPart, availableWidth);
 			}
 			p.setPen(_st.item.statusFgActive);
-			p.drawTextLeft(_st.item.statusPosition.x(), _st.item.statusPosition.y(), width(), highlightedPart);
+			p.drawTextLeft(statusx, statusy, width(), highlightedPart);
 		} else {
 			grayedPart = st::contactsStatusFont->elided(grayedPart, availableWidth - highlightedWidth);
 			p.setPen(_st.item.statusFgActive);
-			p.drawTextLeft(_st.item.statusPosition.x(), _st.item.statusPosition.y(), width(), highlightedPart);
+			p.drawTextLeft(statusx, statusy, width(), highlightedPart);
 			p.setPen(selected ? _st.item.statusFgOver : _st.item.statusFg);
-			p.drawTextLeft(_st.item.statusPosition.x() + highlightedWidth, _st.item.statusPosition.y(), width(), grayedPart);
+			p.drawTextLeft(statusx + highlightedWidth, statusy, width(), grayedPart);
 		}
 	} else {
-		row->paintStatusText(p, _st.item, _st.item.statusPosition.x(), _st.item.statusPosition.y(), statusw, width(), selected);
+		row->paintStatusText(p, _st.item, statusx, statusy, statusw, width(), selected);
 	}
 
 	row->elementsPaint(