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

Fixed some global shortcuts with non-primary windows.

This commit is contained in:
23rd 2022-07-07 03:19:39 +03:00 committed by John Preston
parent 032372f150
commit 6450c213e6
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
View File

@ -398,7 +398,8 @@ void Widget::setupShortcuts() {
) | rpl::filter([=] {
return Ui::AppInFocus()
&& Ui::InFocusChain(this)
&& !Ui::isLayerShown();
&& !Ui::isLayerShown()
&& isActiveWindow();
}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
using Command = Shortcuts::Command;
request->check(Command::Search, 2) && request->handle([=] {

3
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -1814,7 +1814,8 @@ void HistoryWidget::setupShortcuts() {
) | rpl::filter([=] {
return Ui::AppInFocus()
&& Ui::InFocusChain(this)
&& !Ui::isLayerShown();
&& !Ui::isLayerShown()
&& (Core::App().activeWindow() == &controller()->window());
}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
using Command = Shortcuts::Command;
if (_history) {

4
Telegram/SourceFiles/info/info_wrap_widget.cpp
View File

@ -109,7 +109,9 @@ WrapWidget::WrapWidget(
void WrapWidget::setupShortcuts() {
Shortcuts::Requests(
) | rpl::filter([=] {
return requireTopBarSearch();
return requireTopBarSearch()
&& (Core::App().activeWindow()
== &_controller->parentController()->window());
}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
using Command = Shortcuts::Command;
request->check(Command::Search) && request->handle([=] {

4
Telegram/SourceFiles/menu/menu_send.cpp
View File

@ -104,7 +104,9 @@ void SetupMenuAndShortcuts(
});
Shortcuts::Requests(
) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
) | rpl::filter([=] {
return button->isActiveWindow();
}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
using Command = Shortcuts::Command;
const auto now = type();

4
Telegram/SourceFiles/window/window_session_controller.cpp
View File

@ -767,7 +767,9 @@ void SessionController::initSupportMode() {
session().supportHelper().registerWindow(this);
Shortcuts::Requests(
) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
) | rpl::filter([=] {
return (Core::App().activeWindow() == &window());
}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
using C = Shortcuts::Command;
request->check(C::SupportHistoryBack) && request->handle([=] {