void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-22 09:07:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed ability to reply with voice message.

Browse source
This commit is contained in:
23rd 2020-12-18 03:40:43 +03:00
parent a0b0799399
commit 50ed60f443
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,6 +773,12 @@ void HistoryWidget::initVoiceRecordBar() {
return false;
});
const auto applyLocalDraft = [=] {
if (_history && _history->localDraft()) {
applyDraft();
}
};
_voiceRecordBar->sendActionUpdates(
) | rpl::start_with_next([=](const auto &data) {
if (!_history) {
@ -799,8 +805,12 @@ void HistoryWidget::initVoiceRecordBar() {
data.duration,
action);
_voiceRecordBar->clearListenState();
applyLocalDraft();
}, lifetime());
_voiceRecordBar->cancelRequests(
) | rpl::start_with_next(applyLocalDraft, lifetime());
_voiceRecordBar->lockShowStarts(
) | rpl::start_with_next([=] {
updateHistoryDownVisibility();
@ -817,13 +827,6 @@ void HistoryWidget::initVoiceRecordBar() {
_scroll->viewportEvent(e);
}, lifetime());
_voiceRecordBar->shownValue(
) | rpl::start_with_next([=](bool shown) {
if (!shown) {
applyDraft();
}
}, lifetime());
_voiceRecordBar->hideFast();
}
@ -1620,13 +1623,16 @@ void HistoryWidget::fastShowAtEnd(not_null<History*> history) {
void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
InvokeQueued(this, [=] { updateStickersByEmoji(); });
if (_voiceRecordBar->isActive()) {
return;
}
auto draft = !_history
? nullptr
: _history->localEditDraft()
? _history->localEditDraft()
: _history->localDraft();
auto fieldAvailable = canWriteMessage()
&& !_voiceRecordBar->isActive();
auto fieldAvailable = canWriteMessage();
if (!draft || (!_history->localEditDraft() && !fieldAvailable)) {
auto fieldWillBeHiddenAfterEdit = (!fieldAvailable && _editMsgId != 0);
clearFieldText(0, fieldHistoryAction);

5
Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
View file

@ -1307,6 +1307,7 @@ void VoiceRecordBar::hideFast() {
void VoiceRecordBar::stopRecording(StopType type) {
using namespace ::Media::Capture;
if (type == StopType::Cancel) {
_cancelRequests.fire({});
instance()->stop();
return;
}
@ -1404,6 +1405,10 @@ rpl::producer<VoiceToSend> VoiceRecordBar::sendVoiceRequests() const {
return _sendVoiceRequests.events();
}
rpl::producer<> VoiceRecordBar::cancelRequests() const {
return _cancelRequests.events();
}
bool VoiceRecordBar::isRecording() const {
return _recording.current();
}

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

@ -61,6 +61,7 @@ public:
[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
[[nodiscard]] rpl::producer<> cancelRequests() const;
[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
[[nodiscard]] rpl::producer<not_null<QEvent*>> lockViewportEvents() const;
@ -128,6 +129,7 @@ private:
rpl::event_stream<SendActionUpdate> _sendActionUpdates;
rpl::event_stream<VoiceToSend> _sendVoiceRequests;
rpl::event_stream<> _cancelRequests;
rpl::event_stream<> _listenChanges;
int _centerY = 0;