fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-20 08:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attemp to fix freeze on different backends.

Browse Source
This commit is contained in:
John Preston
2026-05-15 17:26:57 +04:00
parent 7e67664e91
commit e75e884469
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
View File

@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/debug_log.h"
#include "base/invoke_queued.h"
#include "base/options.h"
#include "base/platform/base_platform_info.h"
#include "base/qt_signal_producer.h"
#include "base/random.h"
#include "styles/style_chat.h"
@@ -321,6 +322,19 @@ void LogNativeMessageRejected(
return { { u"theme_params"_q, parsed.object() } };
}
[[nodiscard]] Platform::ForeignParent CompatibleForeignParent(
Platform::ForeignParent parent) {
switch (parent.type) {
case Platform::ForeignParent::Type::None:
return {};
case Platform::ForeignParent::Type::X11:
return ::Platform::IsX11() ? parent : Platform::ForeignParent();
case Platform::ForeignParent::Type::Wayland:
return ::Platform::IsWayland() ? parent : Platform::ForeignParent();
}
return {};
}
enum class SharedPanelMenuAction {
None,
Settings,
@@ -1659,8 +1673,19 @@ void Panel::sendExternalShellEvent(
|| _externalShellToken.isEmpty()) {
return;
}
_webview->window.eval(
LinuxShell::EventScript(event, data, _externalShellToken));
const auto generation = _externalShellGeneration;
const auto token = _externalShellToken;
crl::on_main(this, [=] {
if (!_externalShell
|| !_externalShellBootstrapped
|| !_webview
|| _externalShellGeneration != generation
|| _externalShellToken != token) {
return;
}
_webview->window.eval(
LinuxShell::EventScript(event, data, _externalShellToken));
});
}
void Panel::sendExternalShellButton(
@@ -1886,7 +1911,8 @@ Panel::ExternalShellAnchor Panel::externalShellAnchor() const {
auto popupAnchor = _webview->window.popupAnchor();
auto result = ExternalShellAnchor{
.outerSize = std::move(popupAnchor.outerSize),
.transientParent = std::move(popupAnchor.transientParent),
.transientParent = CompatibleForeignParent(
std::move(popupAnchor.transientParent)),
};
switch (result.transientParent.type) {
case Ui::Platform::ForeignParent::Type::X11: