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

Try anchor external webapp shell and popups.

Browse Source
This commit is contained in:
John Preston
2026-05-14 22:16:20 +04:00
parent e3a93be713
commit 0090e2c7f8
5 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1643,15 +1643,30 @@ Panel::ExternalShellAnchor Panel::externalShellAnchor() const {
if (!_webview) {
return {};
}
const auto transientParent = _webview->window.winId();
if (!transientParent) {
auto popupAnchor = _webview->window.popupAnchor();
auto result = ExternalShellAnchor{
.outerSize = std::move(popupAnchor.outerSize),
.transientParent = std::move(popupAnchor.transientParent),
};
switch (result.transientParent.type) {
case Ui::Platform::ForeignParent::Type::X11:
result.anchorGeometry = Ui::Platform::ForeignWindowGeometry(
result.transientParent);
if (result.anchorGeometry) {
result.outerSize = std::nullopt;
}
break;
case Ui::Platform::ForeignParent::Type::None:
case Ui::Platform::ForeignParent::Type::Wayland:
result.anchorGeometry = std::move(popupAnchor.geometry);
break;
}
if (!result.transientParent
&& !result.anchorGeometry
&& !result.outerSize) {
return {};
}
return {
.anchorGeometry = Ui::Platform::ForeignWindowGeometry(
transientParent),
.transientParent = transientParent,
};
return result;
}
Webview::PopupResult Panel::showBlockingPopup(Webview::PopupArgs &&args) {
@@ -2984,6 +2999,7 @@ void Panel::showBox(
const auto anchor = externalShellAnchor();
_externalLayer->setAnchor(
anchor.anchorGeometry,
anchor.outerSize,
anchor.transientParent);
_externalLayer->showBox(std::move(box), options, animated);
return;