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

Fix share focus in IV.

Browse source
This commit is contained in:
John Preston 2024-07-24 16:07:43 +02:00
parent c70866a995
commit 1ebe3255e0
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Telegram/SourceFiles/iv/iv_instance.cpp
View file

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "apiwrap.h" #include "apiwrap.h"
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
#include "base/qt_signal_producer.h"
#include "boxes/share_box.h" #include "boxes/share_box.h"
#include "core/application.h" #include "core/application.h"
#include "core/file_utilities.h" #include "core/file_utilities.h"
@ -49,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_session_controller_link_info.h" #include "window/window_session_controller_link_info.h"
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QWindow>
namespace Iv { namespace Iv {
namespace { namespace {
@ -298,12 +300,33 @@ ShareBoxResult Shown::shareBox(ShareBoxDescriptor &&descriptor) {
state->destroyRequests.fire({}); state->destroyRequests.fire({});
}, wrap->lifetime()); }, wrap->lifetime());
const auto waiting = layer->lifetime().make_state<rpl::lifetime>();
const auto focus = crl::guard(layer, [=] { const auto focus = crl::guard(layer, [=] {
if (!layer->window()->isActiveWindow()) { const auto set = [=] {
layer->window()->activateWindow();
layer->window()->setFocus(); layer->window()->setFocus();
layer->setInnerFocus();
};
const auto handle = layer->window()->windowHandle();
if (!handle) {
waiting->destroy();
return;
} else if (QGuiApplication::focusWindow() == handle) {
waiting->destroy();
set();
} else {
*waiting = base::qt_signal_producer(
qApp,
&QGuiApplication::focusWindowChanged
) | rpl::filter([=](QWindow *focused) {
const auto handle = layer->window()->windowHandle();
return handle && (focused == handle);
}) | rpl::start_with_next([=] {
waiting->destroy();
set();
});
layer->window()->activateWindow();
} }
layer->setInnerFocus();
}); });
auto result = ShareBoxResult{ auto result = ShareBoxResult{
.focus = focus, .focus = focus,