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

Added ability to send and cancel recorded voice data with keys.

Browse source
This commit is contained in:
23rd 2020-11-07 22:38:03 +03:00 • committed by John Preston
parent a19e3ca3dc
commit 8b2bb722de
2 changed files with 81 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -622,37 +622,7 @@ void VoiceRecordBar::init() {
_listen->lifetime().add([=] { _listenChanges.fire({}); });
auto filterCallback = [=](not_null<QEvent*> e) {
using Result = base::EventFilterResult;
if (_send->type() != Ui::SendButton::Type::Send
&& _send->type() != Ui::SendButton::Type::Schedule) {
return Result::Continue;
}
switch(e->type()) {
case QEvent::MouseButtonRelease: {
auto callback = [=] {
const auto data = _listen->data();
_sendVoiceRequests.fire({
data->bytes,
data->waveform,
Duration(data->samples) });
hide();
};
visibilityAnimate(false, std::move(callback));
_send->clearState();
return Result::Cancel;
}
default: return Result::Continue;
}
};
auto filter = base::install_event_filter(
_send.get(),
std::move(filterCallback));
_listen->lifetime().make_state<base::unique_qptr<QObject>>(
std::move(filter));
installListenStateFilter();
}, lifetime());
}
@ -1045,4 +1015,83 @@ void VoiceRecordBar::installClickOutsideFilter() {
std::move(filter));
}
void VoiceRecordBar::installListenStateFilter() {
const auto close = [=](bool send) {
auto callback = [=] {
if (send) {
const auto data = _listen->data();
_sendVoiceRequests.fire({
data->bytes,
data->waveform,
Duration(data->samples) });
}
hide();
};
visibilityAnimate(false, std::move(callback));
};
const auto isSend = [=] {
return _send->type() == Ui::SendButton::Type::Send
|| _send->type() == Ui::SendButton::Type::Schedule;
};
auto mouseFilterCallback = [=](not_null<QEvent*> e) {
using Result = base::EventFilterResult;
if (!isSend()) {
return Result::Continue;
}
switch(e->type()) {
case QEvent::MouseButtonRelease: {
close(true);
_send->clearState();
return Result::Cancel;
}
default: return Result::Continue;
}
};
auto sendFilter = base::install_event_filter(
_send.get(),
std::move(mouseFilterCallback));
_listen->lifetime().make_state<base::unique_qptr<QObject>>(
std::move(sendFilter));
auto keyFilterCallback = [=](not_null<QEvent*> e) {
using Result = base::EventFilterResult;
if (!isSend()) {
return Result::Continue;
}
switch(e->type()) {
case QEvent::KeyPress: {
const auto key = static_cast<QKeyEvent*>(e.get())->key();
const auto isEsc = (key == Qt::Key_Escape);
const auto isEnter = (key == Qt::Key_Enter
|| key == Qt::Key_Return);
if (isEnter) {
close(true);
return Result::Cancel;
}
if (isEsc) {
if (_escFilter && _escFilter()) {
return Result::Continue;
} else {
close(false);
return Result::Cancel;
}
}
return Result::Continue;
}
default: return Result::Continue;
}
};
auto keyFilter = base::install_event_filter(
QCoreApplication::instance(),
std::move(keyFilterCallback));
_listen->lifetime().make_state<base::unique_qptr<QObject>>(
std::move(keyFilter));
}
} // namespace HistoryView::Controls

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

@ -95,6 +95,7 @@ private:
void startRedCircleAnimation();
void installClickOutsideFilter();
void installListenStateFilter();
bool isTypeRecord() const;
bool hasDuration() const;