mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Update API scheme on layer 140.

Browse Source
This commit is contained in:
John Preston
2022-03-28 18:02:54 +04:00
parent 20bdbf531a
commit df15ff9f8e
18 changed files with 157 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,19 +66,22 @@ Panel::Progress::Progress(QWidget *parent, Fn<QRect()> rect)
st::paymentsLoading) {
}
Panel::Panel(const QString &userDataPath, Fn<void()> send, Fn<void()> close)
Panel::Panel(
const QString &userDataPath,
Fn<void(QByteArray)> sendData,
Fn<void()> close)
: _userDataPath(userDataPath)
, _send(std::move(send))
, _sendData(std::move(sendData))
, _close(std::move(close))
, _widget(std::make_unique<SeparatePanel>()) {
_widget->setInnerSize(st::paymentsPanelSize);
_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
_widget->closeRequests(
) | rpl::start_with_next(close, _widget->lifetime());
) | rpl::start_with_next(_close, _widget->lifetime());
_widget->closeEvents(
) | rpl::start_with_next(close, _widget->lifetime());
) | rpl::start_with_next(_close, _widget->lifetime());
setTitle(rpl::single(u"Title"_q));
}
@@ -293,11 +296,17 @@ bool Panel::createWebview() {
"Not an array received in buy_callback arguments."));
return;
}
const auto command = message.array().at(0).toString();
const auto list = message.array();
const auto command = list.at(0).toString();
if (command == "webview_close") {
_close();
} else if (command == "webview_send_result_message") {
_send();
} else if (command == "webview_data_send") {
//const auto tmp = list.at(1).toObject()["data"].toString().toUtf8();
const auto send = [send = _sendData, message] {
send(message.toJson(QJsonDocument::Compact));
};
_close();
send();
}
});
@@ -428,7 +437,7 @@ rpl::lifetime &Panel::lifetime() {
std::unique_ptr<Panel> Show(Args &&args) {
auto result = std::make_unique<Panel>(
args.userDataPath,
std::move(args.send),
std::move(args.sendData),
std::move(args.close));
result->showWebview(args.url, rpl::single(u"smth"_q));
return result;

10
Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
View File

@@ -23,7 +23,10 @@ namespace Ui::BotWebView {
class Panel final {
public:
Panel(const QString &userDataPath, Fn<void()> send, Fn<void()> close);
Panel(
const QString &userDataPath,
Fn<void(QByteArray)> sendData,
Fn<void()> close);
~Panel();
void requestActivate();
@@ -56,7 +59,7 @@ private:
void setupProgressGeometry();
QString _userDataPath;
Fn<void()> _send;
Fn<void(QByteArray)> _sendData;
Fn<void()> _close;
std::unique_ptr<SeparatePanel> _widget;
std::unique_ptr<WebviewWithLifetime> _webview;
@@ -69,8 +72,9 @@ private:
struct Args {
QString url;
QString userDataPath;
Fn<void()> send;
Fn<void(QByteArray)> sendData;
Fn<void()> close;
bool simple = false;
};
[[nodiscard]] std::unique_ptr<Panel> Show(Args &&args);