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

Changed behavior in voice record bar to create ttl button on demand.

Browse source
This commit is contained in:
23rd 2024-01-16 16:12:46 +03:00 • committed by John Preston
parent 6686fe110d
commit 83fc19e143
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -292,9 +292,10 @@ TTLButton::TTLButton(
, _st(st) , _st(st)
, _rippleRect(Rect(Size(st::historyRecordLockTopShadow.width())) , _rippleRect(Rect(Size(st::historyRecordLockTopShadow.width()))
- (st::historyRecordLockRippleMargin)) { - (st::historyRecordLockRippleMargin)) {
resize(Size(st::historyRecordLockTopShadow.width())); QWidget::resize(Size(st::historyRecordLockTopShadow.width()));
Ui::AbstractButton::setDisabled(true);
setClickedCallback([=] { Ui::AbstractButton::setClickedCallback([=] {
Ui::AbstractButton::setDisabled(!Ui::AbstractButton::isDisabled()); Ui::AbstractButton::setDisabled(!Ui::AbstractButton::isDisabled());
const auto isActive = !Ui::AbstractButton::isDisabled(); const auto isActive = !Ui::AbstractButton::isDisabled();
_activeAnimation.start( _activeAnimation.start(
@ -306,7 +307,7 @@ TTLButton::TTLButton(
Ui::RpWidget::shownValue() | rpl::filter( Ui::RpWidget::shownValue() | rpl::filter(
rpl::mappers::_1 rpl::mappers::_1
) | rpl::skip(1) | rpl::take(1) | rpl::start_with_next([=] { ) | rpl::take(1) | rpl::start_with_next([=] {
auto text = rpl::conditional( auto text = rpl::conditional(
Core::App().settings().ttlVoiceClickTooltipHiddenValue(), Core::App().settings().ttlVoiceClickTooltipHiddenValue(),
tr::lng_record_once_active_tooltip( tr::lng_record_once_active_tooltip(
@ -400,7 +401,7 @@ TTLButton::TTLButton(
void TTLButton::clearState() { void TTLButton::clearState() {
Ui::AbstractButton::setDisabled(true); Ui::AbstractButton::setDisabled(true);
update(); QWidget::update();
Ui::RpWidget::hide(); Ui::RpWidget::hide();
} }
@ -1168,7 +1169,6 @@ VoiceRecordBar::VoiceRecordBar(
, _show(std::move(descriptor.show)) , _show(std::move(descriptor.show))
, _send(std::move(descriptor.send)) , _send(std::move(descriptor.send))
, _lock(std::make_unique<RecordLock>(_outerContainer, _st.lock)) , _lock(std::make_unique<RecordLock>(_outerContainer, _st.lock))
, _ttlButton(std::make_unique<TTLButton>(_outerContainer, _st))
, _level(std::make_unique<VoiceRecordButton>(_outerContainer, _st)) , _level(std::make_unique<VoiceRecordButton>(_outerContainer, _st))
, _cancel(std::make_unique<CancelButton>(this, _st, descriptor.recorderHeight)) , _cancel(std::make_unique<CancelButton>(this, _st, descriptor.recorderHeight))
, _startTimer([=] { startRecording(); }) , _startTimer([=] { startRecording(); })
@ -1247,6 +1247,9 @@ void VoiceRecordBar::updateLockGeometry() {
void VoiceRecordBar::updateTTLGeometry( void VoiceRecordBar::updateTTLGeometry(
TTLAnimationType type, TTLAnimationType type,
float64 progress) { float64 progress) {
if (!_ttlButton) {
return;
}
const auto parent = parentWidget(); const auto parent = parentWidget();
const auto me = Ui::MapFrom(_outerContainer, parent, geometry()); const auto me = Ui::MapFrom(_outerContainer, parent, geometry());
const auto anyTop = me.y() - st::historyRecordLockPosition.y(); const auto anyTop = me.y() - st::historyRecordLockPosition.y();
@ -1406,6 +1409,11 @@ void VoiceRecordBar::init() {
_lock->locks( _lock->locks(
) | rpl::start_with_next([=] { ) | rpl::start_with_next([=] {
if (_hasTTLFilter && _hasTTLFilter()) { if (_hasTTLFilter && _hasTTLFilter()) {
if (!_ttlButton) {
_ttlButton = std::make_unique<TTLButton>(
_outerContainer,
_st);
}
_ttlButton->show(); _ttlButton->show();
} }
updateTTLGeometry(TTLAnimationType::RightTopStatic, 0); updateTTLGeometry(TTLAnimationType::RightTopStatic, 0);
@ -1869,7 +1877,7 @@ bool VoiceRecordBar::isRecordingByAnotherBar() const {
} }
bool VoiceRecordBar::isTTLButtonShown() const { bool VoiceRecordBar::isTTLButtonShown() const {
return !_ttlButton->isHidden(); return _ttlButton && !_ttlButton->isHidden();
} }
bool VoiceRecordBar::hasDuration() const { bool VoiceRecordBar::hasDuration() const {
@ -1904,10 +1912,13 @@ void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
} }
bool VoiceRecordBar::peekTTLState() const { bool VoiceRecordBar::peekTTLState() const {
return !_ttlButton->isDisabled(); return _ttlButton && !_ttlButton->isDisabled();
} }
bool VoiceRecordBar::takeTTLState() const { bool VoiceRecordBar::takeTTLState() const {
if (!_ttlButton) {
return false;
}
const auto hasTtl = !_ttlButton->isDisabled(); const auto hasTtl = !_ttlButton->isDisabled();
_ttlButton->clearState(); _ttlButton->clearState();
return hasTtl; return hasTtl;

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

@ -157,9 +157,9 @@ private:
const std::shared_ptr<ChatHelpers::Show> _show; const std::shared_ptr<ChatHelpers::Show> _show;
const std::shared_ptr<Ui::SendButton> _send; const std::shared_ptr<Ui::SendButton> _send;
const std::unique_ptr<RecordLock> _lock; const std::unique_ptr<RecordLock> _lock;
const std::unique_ptr<Ui::AbstractButton> _ttlButton;
const std::unique_ptr<VoiceRecordButton> _level; const std::unique_ptr<VoiceRecordButton> _level;
const std::unique_ptr<CancelButton> _cancel; const std::unique_ptr<CancelButton> _cancel;
std::unique_ptr<Ui::AbstractButton> _ttlButton;
std::unique_ptr<ListenWrap> _listen; std::unique_ptr<ListenWrap> _listen;
base::Timer _startTimer; base::Timer _startTimer;