diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index 77f2fa24e..ee401e81c 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -407,12 +407,12 @@ groupCallWidth: 380px; groupCallHeight: 580px; groupCallRipple: RippleAnimation(defaultRippleAnimation) { - color: groupCallMembersRipple; + color: groupCallMembersBgRipple; } groupCallMembersListItem: PeerListItem(defaultPeerListItem) { button: OutlineButton(defaultPeerListButton) { textBg: groupCallMembersBg; - textBgOver: groupCallMembersBg; + textBgOver: groupCallMembersBgOver; textFg: groupCallMemberInactiveStatus; textFgOver: groupCallMemberInactiveStatus; @@ -459,7 +459,7 @@ groupCallInviteMembersList: PeerList(groupCallMembersList) { groupCallMultiSelect: MultiSelect(defaultMultiSelect) { bg: groupCallMembersBg; item: MultiSelectItem(defaultMultiSelectItem) { - textBg: groupCallMembersRipple; + textBg: groupCallMembersBgRipple; textFg: groupCallMembersFg; textActiveBg: groupCallActiveFg; textActiveFg: groupCallMembersFg; @@ -557,10 +557,10 @@ groupCallBox: Box(defaultBox) { numbersTextFg: groupCallActiveFg; numbersTextFgOver: groupCallActiveFg; textBg: groupCallMembersBg; - textBgOver: groupCallBoxButtonBgOver; + textBgOver: groupCallMembersBgOver; ripple: RippleAnimation(defaultRippleAnimation) { - color: groupCallBoxButtonBgRipple; + color: groupCallMembersBgRipple; } } margin: margins(0px, 56px, 0px, 10px); @@ -594,15 +594,15 @@ groupCallRadio: Radio(defaultRadio) { groupCallCheckbox: Checkbox(defaultBoxCheckbox) { textFg: groupCallMembersFg; textFgActive: groupCallMembersFg; - rippleBg: groupCallMembersRipple; - rippleBgActive: groupCallBoxButtonBgRipple; + rippleBg: groupCallMembersBgRipple; + rippleBgActive: groupCallMembersBgRipple; } groupCallSettingsButton: SettingsButton { textFg: groupCallMembersFg; textFgOver: groupCallMembersFg; textBg: groupCallMembersBg; - textBgOver: groupCallBoxButtonBgOver; + textBgOver: groupCallMembersBgOver; font: boxTextFont; rightLabel: FlatLabel(defaultSettingsRightLabel) { @@ -613,7 +613,7 @@ groupCallSettingsButton: SettingsButton { padding: margins(22px, 10px, 22px, 8px); ripple: RippleAnimation(defaultRippleAnimation) { - color: groupCallBoxButtonBgRipple; + color: groupCallMembersBgRipple; } } groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) { diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp index 9531d0870..19e516b8a 100644 --- a/Telegram/SourceFiles/calls/calls_group_members.cpp +++ b/Telegram/SourceFiles/calls/calls_group_members.cpp @@ -646,7 +646,11 @@ GroupMembers::GroupMembers( paintRequest( ) | rpl::start_with_next([=](QRect clip) { - QPainter(this).fillRect(clip, st::groupCallMembersBg); + const auto headerPart = clip.intersected( + QRect(0, 0, width(), _header->height())); + if (!headerPart.isEmpty()) { + QPainter(this).fillRect(headerPart, st::groupCallMembersBg); + } }, lifetime()); } diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp index 8e86943f6..8f4ab9eaa 100644 --- a/Telegram/SourceFiles/calls/calls_group_settings.cpp +++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp @@ -85,7 +85,11 @@ void GroupCallSettingsBox( const auto joinMuted = goodReal ? real->joinMuted() : false; const auto canChangeJoinMuted = (goodReal && real->canChangeJoinMuted()); - const auto muteJoined = (channel->canManageCall() && canChangeJoinMuted) + const auto addCheck = (channel->canManageCall() && canChangeJoinMuted); + if (addCheck) { + AddSkip(layout); + } + const auto muteJoined = addCheck ? box->addRow(object_ptr( box.get(), tr::lng_group_call_new_muted(), @@ -93,7 +97,7 @@ void GroupCallSettingsBox( st::groupCallCheckbox, st::groupCallCheck)) : nullptr; - if (muteJoined) { + if (addCheck) { AddSkip(layout); } diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 7287e235e..79ea65112 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 7287e235e0205fd878cd35329d08aa1aa1c218fa +Subproject commit 79ea651127962fff366e9d76ce4d932490b30158