From 5bf46c0e9016dd6217e265e90b26ffbe73142b0e Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 27 Dec 2022 21:14:06 +0300 Subject: [PATCH] Adjusted button style in intro steps to style in settings steps. --- Telegram/Resources/langs/lang.strings | 8 ++++---- Telegram/SourceFiles/boxes/boxes.style | 3 --- Telegram/SourceFiles/intro/intro.style | 7 +++---- Telegram/SourceFiles/intro/intro_widget.cpp | 2 ++ Telegram/SourceFiles/window/window_lock_widgets.cpp | 1 + 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 03e15f834d..d87f3bb49b 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -308,11 +308,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_edit_caption_voice" = "Sorry, you can't edit your message while you're having an unsent voice message."; "lng_intro_about" = "Welcome to the official Telegram Desktop app.\nIt's fast and secure."; -"lng_start_msgs" = "START MESSAGING"; +"lng_start_msgs" = "Start messaging"; -"lng_intro_next" = "NEXT"; -"lng_intro_finish" = "SIGN UP"; -"lng_intro_submit" = "SUBMIT"; +"lng_intro_next" = "Next"; +"lng_intro_finish" = "Sign up"; +"lng_intro_submit" = "Submit"; "lng_photo_caption" = "Caption"; "lng_photos_comment" = "Comment"; diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 8805d5330b..2710e2fe7a 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -577,9 +577,6 @@ colorResultInput: InputField(colorValueInput) { changePhoneButton: RoundButton(defaultActiveButton) { width: 256px; - height: 42px; - textTop: 11px; - font: boxButtonFont; } changePhoneButtonPadding: margins(0px, 32px, 0px, 44px); changePhoneTitle: FlatLabel(boxTitle) { diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style index c80be0201d..c05508bc59 100644 --- a/Telegram/SourceFiles/intro/intro.style +++ b/Telegram/SourceFiles/intro/intro.style @@ -84,10 +84,9 @@ introCoverDuration: 200; introNextButton: RoundButton(defaultActiveButton) { width: 300px; - height: 56px; - - textTop: 17px; - font: font(17px semibold); + height: 42px; + textTop: 11px; + font: font(boxFontSize semibold); } introStepFieldTop: 96px; diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp index 89fa20aeec..6e1f427adb 100644 --- a/Telegram/SourceFiles/intro/intro_widget.cpp +++ b/Telegram/SourceFiles/intro/intro_widget.cpp @@ -128,6 +128,8 @@ Widget::Widget( _back->hide(anim::type::instant); _next->entity()->setClickedCallback([=] { getStep()->submit(); }); + _next->entity()->setTextTransform( + Ui::RoundButton::TextTransform::NoTransform); if (_changeLanguage) { _changeLanguage->finishAnimating(); diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp index 0e62785498..a68a25025a 100644 --- a/Telegram/SourceFiles/window/window_lock_widgets.cpp +++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp @@ -97,6 +97,7 @@ PasscodeLockWidget::PasscodeLockWidget( connect(_passcode, &Ui::MaskedInputField::changed, [=] { changed(); }); connect(_passcode, &Ui::MaskedInputField::submitted, [=] { submit(); }); + _submit->setTextTransform(Ui::RoundButton::TextTransform::NoTransform); _submit->setClickedCallback([=] { submit(); }); _logout->setClickedCallback([=] { window->showLogoutConfirmation();