RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pause stories if reply context menu is shown.

This commit is contained in:
John Preston 2023-07-21 17:11:49 +04:00
parent 0b5c0e3e98
commit 2cc0faa5b3
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
View File

@ -2978,6 +2978,10 @@ rpl::producer<bool> ComposeControls::hasSendTextValue() const {
return _hasSendText.value(); return _hasSendText.value();
} }
rpl::producer<bool> ComposeControls::fieldMenuShownValue() const {
return _field->menuShownValue();
}
bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const { bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
if (_voiceRecordBar->isActive()) { if (_voiceRecordBar->isActive()) {
_voiceRecordBar->showDiscardBox(std::move(continueCallback)); _voiceRecordBar->showDiscardBox(std::move(continueCallback));

1
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
View File

@ -220,6 +220,7 @@ public:
[[nodiscard]] bool isRecordingPressed() const; [[nodiscard]] bool isRecordingPressed() const;
[[nodiscard]] rpl::producer<bool> recordingActiveValue() const; [[nodiscard]] rpl::producer<bool> recordingActiveValue() const;
[[nodiscard]] rpl::producer<bool> hasSendTextValue() const; [[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
[[nodiscard]] rpl::producer<bool> fieldMenuShownValue() const;
void applyCloudDraft(); void applyCloudDraft();
void applyDraft( void applyDraft(

3
Telegram/SourceFiles/media/stories/media_stories_reply.cpp
View File

@ -673,8 +673,9 @@ rpl::producer<bool> ReplyArea::activeValue() const {
_controls->focusedValue(), _controls->focusedValue(),
_controls->recordingActiveValue(), _controls->recordingActiveValue(),
_controls->tabbedPanelShownValue(), _controls->tabbedPanelShownValue(),
_controls->fieldMenuShownValue(),
_choosingAttach.value(), _choosingAttach.value(),
_1 || _2 || _3 || _4 _1 || _2 || _3 || _4 || _5
) | rpl::distinct_until_changed(); ) | rpl::distinct_until_changed();
} }

4
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -486,10 +486,6 @@ OverlayWidget::OverlayWidget()
return base::EventFilterResult::Cancel; return base::EventFilterResult::Cancel;
} else if (type == QEvent::ThemeChange && Platform::IsLinux()) { } else if (type == QEvent::ThemeChange && Platform::IsLinux()) {
_window->setWindowIcon(Window::CreateIcon(_session)); _window->setWindowIcon(Window::CreateIcon(_session));
} else if (type == QEvent::FocusOut) {
if (const auto popup = QApplication::activePopupWidget()) {
int a = popup->x();
}
} }
return base::EventFilterResult::Continue; return base::EventFilterResult::Continue;
}); });

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 39d440f774b5b0986200299c4893e3f6a4678c85 Subproject commit 079d966e45922f90de297fc9f7435cbf8b127b09