void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 07:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved boost limits content to divider.

Browse source
This commit is contained in:
23rd 2023-10-17 10:28:31 +03:00 • committed by John Preston
parent f61c22b065
commit d3aa0664a7
4 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp
View file

@ -194,21 +194,28 @@ InnerWidget::InnerWidget(
const auto status = api->boostStatus(); const auto status = api->boostStatus();
const auto inner = this; const auto inner = this;
Ui::FillBoostLimit( {
fakeShowed->events(), auto dividerContent = object_ptr<Ui::VerticalLayout>(inner);
rpl::single(status.overview.isBoosted), Ui::FillBoostLimit(
inner, fakeShowed->events(),
Ui::BoostBoxData{ rpl::single(status.overview.isBoosted),
.boost = Ui::BoostCounters{ dividerContent.data(),
.level = status.overview.level, Ui::BoostBoxData{
.boosts = status.overview.boostCount, .boost = Ui::BoostCounters{
.thisLevelBoosts .level = status.overview.level,
= status.overview.currentLevelBoostCount, .boosts = status.overview.boostCount,
.nextLevelBoosts .thisLevelBoosts
= status.overview.nextLevelBoostCount, = status.overview.currentLevelBoostCount,
.mine = status.overview.isBoosted, .nextLevelBoosts
} = status.overview.nextLevelBoostCount,
}); .mine = status.overview.isBoosted,
}
});
inner->add(object_ptr<Ui::DividerLabel>(
inner,
std::move(dividerContent),
st::statisticsLimitsDividerPadding));
}
FillOverview(inner, status); FillOverview(inner, status);

1
Telegram/SourceFiles/statistics/statistics.style
View file

@ -115,6 +115,7 @@ statisticsShowMoreButton: SettingsButton(defaultSettingsButton) {
statisticsShowMoreButtonArrowPosition: point(29px, 13px); statisticsShowMoreButtonArrowPosition: point(29px, 13px);
statisticsShowMoreButtonArrowSize: 7px; statisticsShowMoreButtonArrowSize: 7px;
statisticsLimitsDividerPadding: margins(22px, -26px, 22px, 16px);
boostsButton: SettingsButton(defaultSettingsButton) { boostsButton: SettingsButton(defaultSettingsButton) {
textFg: lightButtonFg; textFg: lightButtonFg;
textFgOver: lightButtonFgOver; textFgOver: lightButtonFgOver;

1
Telegram/SourceFiles/ui/effects/premium.style
View file

@ -191,6 +191,7 @@ premiumGiftBox: Box(premiumPreviewBox) {
boostSkipTop: 37px; boostSkipTop: 37px;
boostLimits: PremiumLimits(defaultPremiumLimits) { boostLimits: PremiumLimits(defaultPremiumLimits) {
gradientFromLeft: true; gradientFromLeft: true;
nonPremiumBg: windowBgRipple;
} }
boostBubble: PremiumBubble(defaultPremiumBubble) { boostBubble: PremiumBubble(defaultPremiumBubble) {
height: 32px; height: 32px;

10
Telegram/SourceFiles/ui/effects/premium_graphics.cpp
View file

@ -737,10 +737,12 @@ Line::Line(
_ratio = ratio; _ratio = ratio;
}, lifetime()); }, lifetime());
sizeValue( rpl::combine(
) | rpl::filter([](QSize size) { sizeValue(),
return !size.isEmpty(); parent->widthValue()
}) | rpl::start_with_next([=](QSize size) { ) | rpl::filter([](const QSize &size, int parentWidth) {
return !size.isEmpty() && parentWidth;
}) | rpl::start_with_next([=](const QSize &size, int) {
recache(size); recache(size);
update(); update();
}, lifetime()); }, lifetime());