kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Fix clickable space of message name with chat icon

Browse source
This commit is contained in:
Eric Kotato 2021-12-31 15:16:13 +03:00
parent 3e91a1250d
commit 9c0d3e79ad
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Telegram/SourceFiles/history/view/history_view_message.cpp
View file

@ -1437,9 +1437,26 @@ bool Message::getStateFromName(
if (point.y() >= trect.top() && point.y() < trect.top() + st::msgNameFont->height) { if (point.y() >= trect.top() && point.y() < trect.top() + st::msgNameFont->height) {
auto availableLeft = trect.left(); auto availableLeft = trect.left();
auto availableWidth = trect.width(); auto availableWidth = trect.width();
const auto hasChatTypeIcon = [&]() {
if (const auto sponsored = displayedSponsorBadge()) {
return true;
} else if (!item->isPost() && item->displayFrom()) {
const auto from = item->displayFrom();
if (from->isChat() || from->isMegagroup() || from->isChannel()) {
return true;
} else if (const auto user = from->asUser()) {
if (user->isInaccessible()
|| (user->isBot() && !user->isSupport() && !user->isRepliesChat())) {
return true;
}
}
}
return false;
}();
if (replyWidth) { if (replyWidth) {
availableWidth -= st::msgPadding.right() + replyWidth; availableWidth -= st::msgPadding.right() + replyWidth;
} }
const auto chatIconWidth = (hasChatTypeIcon) ? st::dialogsChatTypeSkip : 0;
const auto from = item->displayFrom(); const auto from = item->displayFrom();
const auto nameText = [&]() -> const Ui::Text::String * { const auto nameText = [&]() -> const Ui::Text::String * {
if (from) { if (from) {
@ -1452,7 +1469,7 @@ bool Message::getStateFromName(
}(); }();
if (point.x() >= availableLeft if (point.x() >= availableLeft
&& point.x() < availableLeft + availableWidth && point.x() < availableLeft + availableWidth
&& point.x() < availableLeft + nameText->maxWidth()) { && point.x() < availableLeft + nameText->maxWidth() + chatIconWidth) {
outResult->link = fromLink(); outResult->link = fromLink();
return true; return true;
} }