From 0464a558f0bbc987b2f82292a3938283f1c9251d Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 21 Sep 2023 12:45:58 +0400 Subject: [PATCH] Add Qt window frame string for Wayland --- Telegram/Resources/langs/lang.strings | 1 + Telegram/SourceFiles/settings/settings_advanced.cpp | 4 +++- Telegram/lib_ui | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 0d0c1e25d..4a0619410 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -548,6 +548,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_settings_title_account_name" = "Show active account"; "lng_settings_title_total_count" = "Total unread count"; "lng_settings_native_frame" = "Use system window frame"; +"lng_settings_qt_frame" = "Use Qt window frame"; "lng_settings_auto_start" = "Launch Telegram when system starts"; "lng_settings_start_min" = "Launch minimized"; "lng_settings_auto_start_disabled_uwp" = "Starting with the system was disabled in Windows Settings.\n\nPlease enable Telegram Desktop in the Startup Apps Settings."; diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp index d95c71f78..b019cffde 100644 --- a/Telegram/SourceFiles/settings/settings_advanced.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced.cpp @@ -409,7 +409,9 @@ void SetupWindowTitleContent( if (Ui::Platform::NativeWindowFrameSupported()) { const auto nativeFrame = addCheckbox( - tr::lng_settings_native_frame(), + Platform::IsWayland() + ? tr::lng_settings_qt_frame() + : tr::lng_settings_native_frame(), Core::App().settings().nativeWindowFrame()); nativeFrame->checkedChanges( diff --git a/Telegram/lib_ui b/Telegram/lib_ui index caff63f28..f317f20ac 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit caff63f28434e295ba274008f1f0fea1ffb25728 +Subproject commit f317f20ac831c9564575f9ce6f0d3f8b40aa4c90