Slightly improved design of Premium Settings.

This commit is contained in:
23rd 2022-08-25 01:01:04 +03:00 committed by John Preston
parent 01b50a8460
commit 638cf237c4
2 changed files with 15 additions and 7 deletions

View file

@ -462,13 +462,13 @@ settingsPremiumMoveRight: IconButton(settingsPremiumMoveLeft) {
icon: settingsPremiumMoveRightIcon; icon: settingsPremiumMoveRightIcon;
iconOver: settingsPremiumMoveRightIconOver; iconOver: settingsPremiumMoveRightIconOver;
} }
settingsPremiumRowTitlePadding: margins(60px, 5px, 46px, 3px); settingsPremiumRowTitlePadding: margins(59px, 5px, 46px, 1px);
settingsPremiumRowAboutPadding: margins(60px, 0px, 46px, 6px); settingsPremiumRowAboutPadding: margins(59px, 0px, 46px, 6px);
settingsPremiumPreviewTitlePadding: margins(24px, 13px, 24px, 3px); settingsPremiumPreviewTitlePadding: margins(24px, 13px, 24px, 3px);
settingsPremiumPreviewAboutPadding: margins(24px, 0px, 24px, 11px); settingsPremiumPreviewAboutPadding: margins(24px, 0px, 24px, 11px);
settingsPremiumPreviewLinePadding: margins(18px, 0px, 18px, 8px); settingsPremiumPreviewLinePadding: margins(18px, 0px, 18px, 8px);
settingsPremiumTitlePadding: margins(0px, 20px, 0px, 16px); settingsPremiumTitlePadding: margins(0px, 18px, 0px, 11px);
settingsPremiumAboutTextStyle: TextStyle(defaultTextStyle) { settingsPremiumAboutTextStyle: TextStyle(defaultTextStyle) {
font: font(12px); font: font(12px);
linkFont: font(12px underline); linkFont: font(12px underline);
@ -484,8 +484,12 @@ settingsPremiumAbout: FlatLabel(defaultFlatLabel) {
textFg: premiumButtonFg; textFg: premiumButtonFg;
minWidth: 190px; minWidth: 190px;
} }
settingsPremiumArrowShift: point(-4px, -1px);
settingsPremiumArrow: icon{{ "fast_to_original", menuIconFg }};
settingsPremiumArrowOver: icon{{ "fast_to_original", menuIconFgOver }};
settingsPremiumStatusPadding: margins(22px, 8px, 22px, 2px); settingsPremiumStatusPadding: margins(22px, 8px, 22px, 2px);
settingsPremiumTopHeight: 220px;
settingsPremiumUserHeight: 223px; settingsPremiumUserHeight: 223px;
settingsPremiumUserTitlePadding: margins(0px, 16px, 0px, 6px); settingsPremiumUserTitlePadding: margins(0px, 16px, 0px, 6px);
settingsPremiumUserTitle: FlatLabel(boxTitle) { settingsPremiumUserTitle: FlatLabel(boxTitle) {

View file

@ -898,6 +898,7 @@ void TopBar::paintEvent(QPaintEvent *e) {
const auto titlePathRect = _titlePath.boundingRect(); const auto titlePathRect = _titlePath.boundingRect();
// Title. // Title.
PainterHighQualityEnabler hq(p);
p.setOpacity(1.); p.setOpacity(1.);
p.setFont(_titleFont); p.setFont(_titleFont);
const auto fullStarRect = starRect(1., 1.); const auto fullStarRect = starRect(1., 1.);
@ -1064,12 +1065,15 @@ void Premium::setupContent() {
button, button,
st::backButton); st::backButton);
arrow->setIconOverride( arrow->setIconOverride(
&st::menuIconSubmenuArrow, &st::settingsPremiumArrow,
&st::menuIconSubmenuArrow); &st::settingsPremiumArrowOver);
arrow->setAttribute(Qt::WA_TransparentForMouseEvents); arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
button->sizeValue( button->sizeValue(
) | rpl::start_with_next([=](const QSize &s) { ) | 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()); }, arrow->lifetime());
const auto section = entry.section; const auto section = entry.section;
@ -1285,7 +1289,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
content->setMaximumHeight(isEmojiStatus content->setMaximumHeight(isEmojiStatus
? st::settingsPremiumUserHeight ? st::settingsPremiumUserHeight
: st::introQrStepsTop); : st::settingsPremiumTopHeight);
content->setMinimumHeight(st::infoLayerTopBarHeight); content->setMinimumHeight(st::infoLayerTopBarHeight);
content->resize(content->width(), content->maximumHeight()); content->resize(content->width(), content->maximumHeight());