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

[Improvement] Always show edit timer

Browse source
This commit is contained in:
Eric Kotato 2022-09-11 06:00:58 +03:00 • committed by Eric Kotato
parent c08798b64b
commit 6ab92cfac8
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -6434,7 +6434,10 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
.ids = session().data().itemsToIds(_forwardPanel->items()) .ids = session().data().itemsToIds(_forwardPanel->items())
}); });
} else { } else {
Ui::showPeerHistory(_peer, _editMsgId ? _editMsgId : replyToId()); controller()->showPeerHistory(
_peer,
Window::SectionShow::Way::ClearStack,
_editMsgId ? _editMsgId : replyToId());
} }
} }
} }
@ -8395,8 +8398,6 @@ void HistoryWidget::paintEditHeader(Painter &p, const QRect &rect, int left, int
auto editTimeLeft = (session().serverConfig().editTimeLimit * 1000LL) - timeSinceMessage; auto editTimeLeft = (session().serverConfig().editTimeLimit * 1000LL) - timeSinceMessage;
if (editTimeLeft < 2) { if (editTimeLeft < 2) {
editTimeLeftText = u"0:00"_q; editTimeLeftText = u"0:00"_q;
} else if (editTimeLeft > kDisplayEditTimeWarningMs) {
updateIn = static_cast<int>(qMin(editTimeLeft - kDisplayEditTimeWarningMs, qint64(kFullDayInMs)));
} else { } else {
updateIn = static_cast<int>(editTimeLeft % 1000); updateIn = static_cast<int>(editTimeLeft % 1000);
if (!updateIn) { if (!updateIn) {
@ -8405,7 +8406,9 @@ void HistoryWidget::paintEditHeader(Painter &p, const QRect &rect, int left, int
++updateIn; ++updateIn;
editTimeLeft = (editTimeLeft - 1) / 1000; // seconds editTimeLeft = (editTimeLeft - 1) / 1000; // seconds
editTimeLeftText = u"%1:%2"_q.arg(editTimeLeft / 60).arg(editTimeLeft % 60, 2, 10, QChar('0')); editTimeLeftText = (editTimeLeft >= 3600
? u"%1:%2:%3"_q.arg(editTimeLeft / 3600).arg(editTimeLeft % 3600 / 60, 2, 10, QChar('0')).arg(editTimeLeft % 60, 2, 10, QChar('0'))
: u"%1:%2"_q.arg(editTimeLeft / 60).arg(editTimeLeft % 60, 2, 10, QChar('0')));
} }
// Restart timer only if we are sure that we've painted the whole timer. // Restart timer only if we are sure that we've painted the whole timer.