From 071411c8b946f958a0e720bcc046e2e0529cee6d Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 Dec 2022 11:41:49 +0400 Subject: [PATCH] Fix fragment button in Intro process. --- Telegram/SourceFiles/boxes/boxes.style | 5 +---- Telegram/SourceFiles/intro/intro.style | 7 +++++++ Telegram/SourceFiles/intro/intro_code.cpp | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 5f736325b..edfb738b1 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -293,11 +293,8 @@ membersAbout: FlatLabel(defaultFlatLabel) { style: boxLabelStyle; } -fragmentBoxButton: RoundButton(introNextButton) { +fragmentBoxButton: RoundButton(introFragmentButton) { width: 256px; - icon: icon {{ "fragment", activeButtonFg }}; - iconOver: icon {{ "fragment", activeButtonFgOver }}; - iconPosition: point(-10px, 9px); } passcodeHeaderFont: font(19px); diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style index f6381e444..d44653392 100644 --- a/Telegram/SourceFiles/intro/intro.style +++ b/Telegram/SourceFiles/intro/intro.style @@ -89,6 +89,13 @@ introNextButton: RoundButton(defaultActiveButton) { textTop: 11px; font: font(boxFontSize semibold); } +introFragmentIcon: icon{{ "fragment", activeButtonFg }}; +introFragmentIconOver: icon{{ "fragment", activeButtonFgOver }}; +introFragmentButton: RoundButton(introNextButton) { + icon: introFragmentIcon; + iconOver: introFragmentIconOver; + iconPosition: point(-10px, 9px); +} introStepFieldTop: 96px; introPhoneTop: 6px; diff --git a/Telegram/SourceFiles/intro/intro_code.cpp b/Telegram/SourceFiles/intro/intro_code.cpp index 360fbc977..1f2fff51b 100644 --- a/Telegram/SourceFiles/intro/intro_code.cpp +++ b/Telegram/SourceFiles/intro/intro_code.cpp @@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "main/main_account.h" #include "mtproto/mtp_instance.h" #include "styles/style_intro.h" -#include "styles/style_boxes.h" namespace Intro { namespace details { @@ -428,7 +427,7 @@ rpl::producer CodeWidget::nextButtonText() const { const style::RoundButton *CodeWidget::nextButtonStyle() const { return !getData()->codeByFragmentUrl.isEmpty() - ? &st::fragmentBoxButton + ? &st::introFragmentButton : nullptr; }