RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't show subscribe button with blocked premium.

This commit is contained in:
John Preston 2022-06-07 11:41:44 +04:00
parent 4570da5767
commit 00bea8d1ee
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/boxes/premium_limits_box.cpp
View File

@ -890,7 +890,7 @@ void FileSizeLimitBox(
const auto defaultGb = (defaultLimit + 999) / 2000;
const auto premiumGb = (premiumLimit + 999) / 2000;
const auto current = fileSizeBytes
const auto current = (fileSizeBytes && premiumPossible)
? std::clamp(
float64(((fileSizeBytes / uint64(1024 * 1024)) + 999) / 1000),
defaultGb,

17
Telegram/SourceFiles/settings/settings_premium.cpp
View File

@ -910,18 +910,27 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
status->resizeToWidth(width);
}, status->lifetime());
const auto session = &_controller->session();
auto premiumPossible = session->account().appConfig().value(
) | rpl::map([=] {
return session->premiumPossible();
});
rpl::combine(
button->heightValue(),
status->heightValue(),
std::move(text),
Data::AmPremiumValue(&_controller->session())
Data::AmPremiumValue(session),
std::move(premiumPossible)
) | rpl::start_with_next([=](
int buttonHeight,
int statusHeight,
const TextWithEntities &text,
bool premium) {
bool premium,
bool premiumPossible) {
const auto padding = st::settingsPremiumButtonPadding;
const auto finalHeight = !premium
const auto finalHeight = !premiumPossible
? 0
: !premium
? (padding.top() + buttonHeight + padding.bottom())
: text.text.isEmpty()
? 0
@ -929,7 +938,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
content->resize(content->width(), finalHeight);
button->moveToLeft(padding.left(), padding.top());
status->moveToLeft(0, 0);
button->setVisible(!premium);
button->setVisible(!premium && premiumPossible);
status->setVisible(premium && !text.text.isEmpty());
if (!premium || text.text.isEmpty()) {
_bottomSkipRounding.reset();