diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index 050786f216..ab855655c9 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -156,19 +156,19 @@ object_ptr InnerWidget::setupContent( result->add(std::move(buttons)); } } - showDivider = rpl::combine( + auto showNext = rpl::combine( std::move(showDivider), sharedTracker.atLeastOneShownValue() ) | rpl::map([](bool show, bool shared) { return show || shared; }) | rpl::distinct_until_changed(); if (auto actions = SetupActions(_controller, result.data(), _peer)) { - addAboutVerificationOrDivider(result, rpl::duplicate(showDivider)); + addAboutVerificationOrDivider(result, rpl::duplicate(showNext)); result->add(std::move(actions)); } if (_peer->isChat() || _peer->isMegagroup()) { if (!_peer->isMonoforum()) { - setupMembers(result.data(), rpl::duplicate(showDivider)); + setupMembers(result.data(), rpl::duplicate(showNext)); } } return result; diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style index b8ca9ec3e8..785e188e96 100644 --- a/Telegram/SourceFiles/media/view/media_view.style +++ b/Telegram/SourceFiles/media/view/media_view.style @@ -11,6 +11,7 @@ using "ui/widgets/widgets.style"; using "ui/menu_icons.style"; using "media/player/media_player.style"; using "boxes/boxes.style"; +using "calls/calls.style"; using "chat_helpers/chat_helpers.style"; mediaviewOverDuration: 150; diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp index ec676a4db0..4c681e09a7 100644 --- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp +++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp @@ -39,7 +39,8 @@ namespace Settings { not_null session, rpl::producer balanceValue, bool rightAlign, - rpl::producer opacityValue = nullptr); + rpl::producer opacityValue = nullptr, + bool dark = false); } // namespace Settings namespace Ui { diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp index 41f87dfb84..73c50b384c 100644 --- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp +++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp @@ -726,7 +726,8 @@ not_null AddBalanceWidget( not_null session, rpl::producer balanceValue, bool rightAlign, - rpl::producer opacityValue) { + rpl::producer opacityValue, + bool dark) { struct State final { float64 opacity = 1.0; Ui::Text::String label; @@ -779,7 +780,7 @@ not_null AddBalanceWidget( auto p = QPainter(balance); p.setOpacity(state->opacity); - p.setPen(st::boxTextFg); + p.setPen(dark ? st::groupCallMembersFg : st::boxTextFg); state->label.draw(p, { .position = QPoint( diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h index ab5d2e32ae..f0f3284ab8 100644 --- a/Telegram/SourceFiles/settings/settings_credits_graphics.h +++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h @@ -84,7 +84,8 @@ void FillCreditOptions( not_null session, rpl::producer balanceValue, bool rightAlign, - rpl::producer opacityValue = nullptr); + rpl::producer opacityValue = nullptr, + bool dark = false); void AddWithdrawalWidget( not_null container,