diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index f6ad9ffe35..86d412b2aa 100644 --- 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 ComposeControls::hasSendTextValue() const { return _hasSendText.value(); } +rpl::producer ComposeControls::fieldMenuShownValue() const { + return _field->menuShownValue(); +} + bool ComposeControls::preventsClose(Fn &&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 index 95a72c356a..de70020122 100644 --- 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 @@ public: [[nodiscard]] bool isRecordingPressed() const; [[nodiscard]] rpl::producer recordingActiveValue() const; [[nodiscard]] rpl::producer hasSendTextValue() const; + [[nodiscard]] rpl::producer 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 index 9d7728b723..9df6d290fd 100644 --- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp +++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp @@ -673,8 +673,9 @@ rpl::producer 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 index 32fd05e73f..0a8be2dc6d 100644 --- 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 index 39d440f774..079d966e45 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 39d440f774b5b0986200299c4893e3f6a4678c85 +Subproject commit 079d966e45922f90de297fc9f7435cbf8b127b09