void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-16 14:17:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't show "Send As" button when editing a message.

Browse source 
Fixes #17302.
This commit is contained in:
John Preston 2021-11-28 16:37:09 +04:00
parent 27e80b8e42
commit 8460a62588
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2270,6 +2270,9 @@ void HistoryWidget::registerDraftSource() {
void HistoryWidget::setEditMsgId(MsgId msgId) {
unregisterDraftSources();
_editMsgId = msgId;
if (_history) {
refreshSendAsToggle();
}
registerDraftSource();
}
@ -2388,7 +2391,7 @@ void HistoryWidget::setupSendAsToggle() {
void HistoryWidget::refreshSendAsToggle() {
Expects(_peer != nullptr);
if (!session().sendAsPeers().shouldChoose(_peer)) {
if (_editMsgId || !session().sendAsPeers().shouldChoose(_peer)) {
_sendAs.destroy();
return;
} else if (_sendAs) {

37
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
View file

@ -1012,6 +1012,10 @@ void ComposeControls::init() {
) | rpl::start_with_next([=](const auto &id) {
unregisterDraftSources();
updateSendButtonType();
if (_history && updateSendAsButton()) {
updateControlsVisibility();
updateControlsGeometry(_wrap->size());
}
registerDraftSource();
}, _wrap->lifetime());
@ -1626,9 +1630,10 @@ void ComposeControls::initSendAsButton() {
) | rpl::filter([=](not_null<PeerData*> peer) {
return _history && (peer == _history->peer);
}) | rpl::start_with_next([=] {
updateSendAsButton();
updateControlsVisibility();
updateControlsGeometry(_wrap->size());
if (updateSendAsButton()) {
updateControlsVisibility();
updateControlsGeometry(_wrap->size());
}
}, _wrap->lifetime());
}
@ -1942,21 +1947,27 @@ void ComposeControls::updateMessagesTTLShown() {
}
}
void ComposeControls::updateSendAsButton() {
bool ComposeControls::updateSendAsButton() {
Expects(_history != nullptr);
const auto peer = _history->peer;
if (!session().sendAsPeers().shouldChoose(peer)) {
if (isEditingMessage() || !session().sendAsPeers().shouldChoose(peer)) {
if (!_sendAs) {
return false;
}
_sendAs = nullptr;
} else if (!_sendAs) {
_sendAs = std::make_unique<Ui::SendAsButton>(
_wrap.get(),
st::sendAsButton);
Ui::SetupSendAsButton(
_sendAs.get(),
rpl::single(peer.get()),
_window);
return true;
} else if (_sendAs) {
return false;
}
_sendAs = std::make_unique<Ui::SendAsButton>(
_wrap.get(),
st::sendAsButton);
Ui::SetupSendAsButton(
_sendAs.get(),
rpl::single(peer.get()),
_window);
return true;
}
void ComposeControls::paintBackground(QRect clip) {

2
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
View file

@ -206,7 +206,7 @@ private:
void updateSubmitSettings();
void updateSendButtonType();
void updateMessagesTTLShown();
void updateSendAsButton();
bool updateSendAsButton();
void updateHeight();
void updateWrappingVisibility();
void updateControlsVisibility();