diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp index 88f74e598..ec042ddcb 100644 --- a/Telegram/SourceFiles/info/info_content_widget.cpp +++ b/Telegram/SourceFiles/info/info_content_widget.cpp @@ -283,8 +283,9 @@ rpl::producer ContentWidget::desiredBottomShadowVisibility() const { using namespace rpl::mappers; return rpl::combine( _scroll->scrollTopValue(), - _scrollBottomSkip.value() - ) | rpl::map([=](int scroll, int skip) { + _scrollBottomSkip.value(), + _scroll->heightValue() + ) | rpl::map([=](int scroll, int skip, int) { return ((skip > 0) && (scroll < _scroll->scrollTopMax())); }); } diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp index 3b83f015d..4051f15e5 100644 --- a/Telegram/SourceFiles/settings/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/settings_premium.cpp @@ -169,9 +169,10 @@ void Premium::setupContent() { const auto from = iconContainers.front()->y(); const auto to = iconContainers.back()->y() + iconSize.height(); auto gradient = QLinearGradient(0, 0, 0, to - from); - gradient.setColorAt(.0, st::premiumButtonBg3->c); - gradient.setColorAt(.5, st::premiumButtonBg2->c); - gradient.setColorAt(1., st::premiumButtonBg1->c); + gradient.setColorAt(0.0, st::premiumIconBg1->c); + gradient.setColorAt(.28, st::premiumIconBg2->c); + gradient.setColorAt(.55, st::premiumButtonBg2->c); + gradient.setColorAt(1.0, st::premiumButtonBg1->c); for (auto i = 0; i < int(icons.size()); i++) { const auto &iconContainer = iconContainers[i]; diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 3668ee108..7133ccd2f 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 3668ee10854005ccff1289851120ae14052eeedd +Subproject commit 7133ccd2f9e5176334e597cd7727d69faf944868