diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 3fc75a735..419aa2029 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -462,13 +462,13 @@ settingsPremiumMoveRight: IconButton(settingsPremiumMoveLeft) { icon: settingsPremiumMoveRightIcon; iconOver: settingsPremiumMoveRightIconOver; } -settingsPremiumRowTitlePadding: margins(60px, 5px, 46px, 3px); -settingsPremiumRowAboutPadding: margins(60px, 0px, 46px, 6px); +settingsPremiumRowTitlePadding: margins(59px, 5px, 46px, 1px); +settingsPremiumRowAboutPadding: margins(59px, 0px, 46px, 6px); settingsPremiumPreviewTitlePadding: margins(24px, 13px, 24px, 3px); settingsPremiumPreviewAboutPadding: margins(24px, 0px, 24px, 11px); settingsPremiumPreviewLinePadding: margins(18px, 0px, 18px, 8px); -settingsPremiumTitlePadding: margins(0px, 20px, 0px, 16px); +settingsPremiumTitlePadding: margins(0px, 18px, 0px, 11px); settingsPremiumAboutTextStyle: TextStyle(defaultTextStyle) { font: font(12px); linkFont: font(12px underline); @@ -484,8 +484,12 @@ settingsPremiumAbout: FlatLabel(defaultFlatLabel) { textFg: premiumButtonFg; minWidth: 190px; } +settingsPremiumArrowShift: point(-4px, -1px); +settingsPremiumArrow: icon{{ "fast_to_original", menuIconFg }}; +settingsPremiumArrowOver: icon{{ "fast_to_original", menuIconFgOver }}; settingsPremiumStatusPadding: margins(22px, 8px, 22px, 2px); +settingsPremiumTopHeight: 220px; settingsPremiumUserHeight: 223px; settingsPremiumUserTitlePadding: margins(0px, 16px, 0px, 6px); settingsPremiumUserTitle: FlatLabel(boxTitle) { diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp index aa32c808d..fa2c6f966 100644 --- a/Telegram/SourceFiles/settings/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/settings_premium.cpp @@ -898,6 +898,7 @@ void TopBar::paintEvent(QPaintEvent *e) { const auto titlePathRect = _titlePath.boundingRect(); // Title. + PainterHighQualityEnabler hq(p); p.setOpacity(1.); p.setFont(_titleFont); const auto fullStarRect = starRect(1., 1.); @@ -1064,12 +1065,15 @@ void Premium::setupContent() { button, st::backButton); arrow->setIconOverride( - &st::menuIconSubmenuArrow, - &st::menuIconSubmenuArrow); + &st::settingsPremiumArrow, + &st::settingsPremiumArrowOver); arrow->setAttribute(Qt::WA_TransparentForMouseEvents); button->sizeValue( ) | rpl::start_with_next([=](const QSize &s) { - arrow->moveToRight(0, (s.height() - arrow->height()) / 2); + const auto &point = st::settingsPremiumArrowShift; + arrow->moveToRight( + -point.x(), + point.y() + (s.height() - arrow->height()) / 2); }, arrow->lifetime()); const auto section = entry.section; @@ -1285,7 +1289,7 @@ QPointer Premium::createPinnedToTop( content->setMaximumHeight(isEmojiStatus ? st::settingsPremiumUserHeight - : st::introQrStepsTop); + : st::settingsPremiumTopHeight); content->setMinimumHeight(st::infoLayerTopBarHeight); content->resize(content->width(), content->maximumHeight());