diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 8bce913e9b..385c712062 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -431,7 +431,7 @@ infoProfileTopBarGiftTopLeft: point(4px, 4px); infoProfileTopBarGiftBottomLeft: point(9px, 16px); infoProfileTopBarGiftRight: point(50px, 13px); infoProfileTopBarGiftTopRight: point(30px, 4px); -infoProfileTopBarGiftBottomRight: point(30px, 16px); +infoProfileTopBarGiftBottomRight: point(40px, 13px); infoProfileTopBarActionButtonBgOpacity: 0.16; infoProfileTopBarActionButtonSize: 52px; @@ -593,13 +593,9 @@ infoIconFg: windowBoldFg; infoProfileSkip: 7px; -infoProfileLabeledPadding: margins(79px, 9px, 30px, 7px); -infoProfileLabeledUsernamePadding: margins(79px, 9px, 20px, 7px); -infoProfileSeparatorPadding: margins( - 77px, - infoProfileSkip, - 0px, - infoProfileSkip); +infoProfileLabeledPadding: margins(23px, 9px, 20px, 7px); +infoProfileLabeledUsernamePadding: margins(23px, 9px, 20px, 7px); +infoProfilePersonalChannelPadding: margins(79px, 9px, 20px, 7px); infoProfileLabeledButtonQr: IconButton(defaultIconButton) { width: 34px; height: 34px; @@ -609,7 +605,7 @@ infoProfileLabeledButtonQr: IconButton(defaultIconButton) { rippleAreaSize: 34px; ripple: defaultRippleAnimation; } -infoProfileLabeledButtonQrRightSkip: 10px; +infoProfileLabeledButtonQrRightSkip: -4px; infoIconInformation: icon {{ "info/info_information", infoIconFg }}; infoIconAddMember: icon {{ "info/info_add_member", infoIconFg }}; @@ -661,7 +657,7 @@ infoPersonalChannelNameLabel: FlatLabel(infoProfileStatus) { style: semiboldTextStyle; maxHeight: 20px; } -infoPersonalChannelDateSkip: 22px; +infoPersonalChannelDateSkip: 20px; infoPersonalChannelDateLabel: FlatLabel(infoProfileStatus) { textFg: dialogsDateFg; style: TextStyle(semiboldTextStyle) { @@ -669,7 +665,7 @@ infoPersonalChannelDateLabel: FlatLabel(infoProfileStatus) { } maxHeight: 20px; } -infoPersonalChannelUserpicSkip: 3px; +infoPersonalChannelUserpicSkip: -5px; infoPersonalChannelUserpic: UserpicButton(defaultUserpicButton) { size: size(42px, 42px); photoSize: 42px; @@ -703,6 +699,7 @@ infoMainButton: SettingsButton(infoProfileButton) { textFg: lightButtonFg; textFgOver: lightButtonFgOver; style: semiboldTextStyle; + padding: margins(23px, 10px, 8px, 8px); } infoMainButtonAttention: SettingsButton(infoMainButton) { textFg: attentionButtonFg; diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index aa6f52702f..c083c9e080 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -1608,7 +1608,7 @@ object_ptr DetailsFiller::setupInfo() { const auto qrButton = Ui::CreateChild( usernameLine.text->parentWidget(), st::infoProfileLabeledButtonQr); - const auto rightSkip = 0;// st::infoProfileLabeledButtonQrRightSkip; + const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip; fitLabelToButton(qrButton, usernameLine.text, rightSkip); fitLabelToButton(qrButton, usernameLine.subtext, rightSkip); qrButton->setClickedCallback([=] { @@ -1692,7 +1692,7 @@ object_ptr DetailsFiller::setupInfo() { const auto qr = Ui::CreateChild( linkLine.text->parentWidget(), st::infoProfileLabeledButtonQr); - const auto rightSkip = 0;// st::infoProfileLabeledButtonQrRightSkip; + const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip; fitLabelToButton(qr, linkLine.text, rightSkip); fitLabelToButton(qr, linkLine.subtext, rightSkip); qr->setClickedCallback([=, peer = _peer] { @@ -1726,10 +1726,6 @@ object_ptr DetailsFiller::setupInfo() { addTranslateToMenu(about.text, AboutWithAdvancedValue(_peer)); } } - object_ptr( - result, - st::infoIconInformation, - st::infoInformationIconPosition); return result; } @@ -1793,7 +1789,7 @@ object_ptr DetailsFiller::setupPersonalChannel( std::move(text), st::infoLabel, st::infoLabeled, - st::infoProfileLabeledPadding); + st::infoProfilePersonalChannelPadding); onlyChannelWrap->entity()->add(std::move(line.wrap)); line.text->setClickHandlerFilter([=]( @@ -1840,7 +1836,7 @@ object_ptr DetailsFiller::setupPersonalChannel( not_null item, anim::type animated) { const auto &stUserpic = st::infoPersonalChannelUserpic; - const auto &stLabeled = st::infoProfileLabeledPadding; + const auto &stLabeled = st::infoProfilePersonalChannelPadding; messageChannelWrap->toggle(false, anim::type::instant); clear(); @@ -1955,10 +1951,10 @@ object_ptr DetailsFiller::setupPersonalChannel( rpl::single(item->history()->peer->asChannel())), st::infoLabel), QMargins( - st::infoProfileLabeledPadding.left(), + st::infoProfilePersonalChannelPadding.left(), 0, - st::infoProfileLabeledPadding.right(), - st::infoProfileLabeledPadding.bottom())); + st::infoProfilePersonalChannelPadding.right(), + st::infoProfilePersonalChannelPadding.bottom())); } { const auto button = Ui::CreateSimpleRectButton(