mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Beta version 6.2.6: Fix build with Xcode.
This commit is contained in:
@@ -156,19 +156,19 @@ object_ptr<Ui::RpWidget> 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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -39,7 +39,8 @@ namespace Settings {
|
||||
not_null<Main::Session*> session,
|
||||
rpl::producer<CreditsAmount> balanceValue,
|
||||
bool rightAlign,
|
||||
rpl::producer<float64> opacityValue = nullptr);
|
||||
rpl::producer<float64> opacityValue = nullptr,
|
||||
bool dark = false);
|
||||
} // namespace Settings
|
||||
|
||||
namespace Ui {
|
||||
|
||||
@@ -726,7 +726,8 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
|
||||
not_null<Main::Session*> session,
|
||||
rpl::producer<CreditsAmount> balanceValue,
|
||||
bool rightAlign,
|
||||
rpl::producer<float64> opacityValue) {
|
||||
rpl::producer<float64> opacityValue,
|
||||
bool dark) {
|
||||
struct State final {
|
||||
float64 opacity = 1.0;
|
||||
Ui::Text::String label;
|
||||
@@ -779,7 +780,7 @@ not_null<Ui::RpWidget*> 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(
|
||||
|
||||
@@ -84,7 +84,8 @@ void FillCreditOptions(
|
||||
not_null<Main::Session*> session,
|
||||
rpl::producer<CreditsAmount> balanceValue,
|
||||
bool rightAlign,
|
||||
rpl::producer<float64> opacityValue = nullptr);
|
||||
rpl::producer<float64> opacityValue = nullptr,
|
||||
bool dark = false);
|
||||
|
||||
void AddWithdrawalWidget(
|
||||
not_null<Ui::VerticalLayout*> container,
|
||||
|
||||
Reference in New Issue
Block a user