Pause stories if reply context menu is shown.

telegramdesktop · Jul 21, 2023 · 2cc0faa · 2cc0faa
1 parent 0b5c0e3
commit 2cc0faa
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2978,6 +2978,10 @@ rpl::producer<bool> ComposeControls::hasSendTextValue() const {
 	return _hasSendText.value();
 }
 
+rpl::producer<bool> ComposeControls::fieldMenuShownValue() const {
+	return _field->menuShownValue();
+}
+
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
 	if (_voiceRecordBar->isActive()) {
 		_voiceRecordBar->showDiscardBox(std::move(continueCallback));

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -220,6 +220,7 @@ class ComposeControls final {
 	[[nodiscard]] bool isRecordingPressed() const;
 	[[nodiscard]] rpl::producer<bool> recordingActiveValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
+	[[nodiscard]] rpl::producer<bool> fieldMenuShownValue() const;
 
 	void applyCloudDraft();
 	void applyDraft(

diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -673,8 +673,9 @@ rpl::producer<bool> ReplyArea::activeValue() const {
 		_controls->focusedValue(),
 		_controls->recordingActiveValue(),
 		_controls->tabbedPanelShownValue(),
+		_controls->fieldMenuShownValue(),
 		_choosingAttach.value(),
-		_1 || _2 || _3 || _4
+		_1 || _2 || _3 || _4 || _5
 	) | rpl::distinct_until_changed();
 }
 

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -486,10 +486,6 @@ OverlayWidget::OverlayWidget()
 			return base::EventFilterResult::Cancel;
 		} else if (type == QEvent::ThemeChange && Platform::IsLinux()) {
 			_window->setWindowIcon(Window::CreateIcon(_session));
-		} else if (type == QEvent::FocusOut) {
-			if (const auto popup = QApplication::activePopupWidget()) {
-				int a = popup->x();
-			}
 		}
 		return base::EventFilterResult::Continue;
 	});

diff --git a/Telegram/lib_ui b/Telegram/lib_ui