From df533f2efe70c5eda898f070bf4d1e8788326f97 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 20 Apr 2022 11:42:03 +0400 Subject: [PATCH] Don't use WebView embed in Windows before 8.1. --- Telegram/Resources/langs/lang.strings | 1 + Telegram/SourceFiles/payments/ui/payments_panel.cpp | 3 +++ Telegram/lib_webview | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index b18bb95608..2f7d6cfbb4 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2148,6 +2148,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-5.0/webkit2gtk-4.1/webkit2gtk-4.0) using your package manager."; "lng_payments_webview_switch_mutter" = "Qt's window embedding doesn't work well with Mutter window manager. Please switch to another window manager or desktop environment."; "lng_payments_webview_switch_wayland" = "There is no way to embed WebView window on Wayland. Please switch to X11."; +"lng_payments_webview_update_windows" = "Please update your system to Windows 8.1 or later."; "lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost."; "lng_payments_receipt_label" = "Receipt"; "lng_payments_receipt_label_test" = "Test receipt"; diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp index 281afce64b..a09f8e37b7 100644 --- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp +++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp @@ -776,6 +776,9 @@ void Panel::showWebviewError( case Error::Wayland: rich.append(tr::lng_payments_webview_switch_wayland(tr::now)); break; + case Error::OldWindows: + rich.append(tr::lng_payments_webview_update_windows(tr::now)); + break; default: rich.append(QString::fromStdString(information.details)); break; diff --git a/Telegram/lib_webview b/Telegram/lib_webview index cc510d306b..0e9c8d86cf 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit cc510d306b51ea83360fd0c0a41ec87fbf698535 +Subproject commit 0e9c8d86cfeec886ec75196adebfd003bde194ab