From 1468be0af4e1e3ad2e28447177ee02cfbccf8ecf Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 8 Feb 2022 20:49:58 +0300 Subject: [PATCH] Adjust main settings buttons geometry to the mockup. --- Telegram/SourceFiles/info/info.style | 2 +- Telegram/SourceFiles/settings/settings.style | 11 ++++++----- Telegram/SourceFiles/settings/settings_main.cpp | 4 +--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 6fac08b872..0969338ff1 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -385,7 +385,7 @@ infoProfileButton: SettingsButton(defaultSettingsButton) { toggle: infoProfileToggle; toggleOver: infoProfileToggleOver; - toggleSkip: 22px; + toggleSkip: 20px; ripple: defaultRippleAnimation; } diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 75fae20b8f..63333d5fe8 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -12,7 +12,7 @@ using "boxes/boxes.style"; settingsSectionButton: SettingsButton(infoProfileButton) { font: boxTextFont; - padding: margins(79px, 13px, 22px, 11px); + padding: margins(60px, 11px, 22px, 9px); } settingsButton: SettingsButton(settingsSectionButton) { padding: margins(22px, 10px, 22px, 8px); @@ -28,12 +28,13 @@ settingsOptionDisabled: SettingsButton(settingsButton) { textBgOver: windowBg; toggleOver: infoProfileToggle; } -settingsSectionSkip: 9px; +settingsSectionSkip: 5px; +settingsSectionBottomSkip: 7px; settingsSectionIconLeft: 22px; settingsSeparatorPadding: margins(22px, infoProfileSkip, 0px, infoProfileSkip); -settingsButtonRightSkip: 28px; -settingsScalePadding: margins(79px, 10px, 28px, 8px); -settingsBigScalePadding: margins(22px, 10px, 22px, 8px); +settingsButtonRightSkip: 23px; +settingsScalePadding: margins(63px, 8px, 21px, 5px); +settingsBigScalePadding: margins(21px, 8px, 21px, 5px); settingsSlider: SettingsSlider(defaultSettingsSlider) { barFg: windowBgOver; labelFg: windowSubTextFg; diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index 39b4dfbb41..ff407ccb1e 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -319,7 +319,7 @@ void SetupSections( SetupLanguageButton(container); - AddSkip(container); + AddSkip(container, st::settingsSectionBottomSkip); } bool HasInterfaceScale() { @@ -499,8 +499,6 @@ void SetupHelp( box->setStrictCancel(true); controller->show(std::move(box)); }); - - AddSkip(container); } Main::Main(