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

Improve colors in group call panel.

Browse source
This commit is contained in:
John Preston 2020-11-30 11:00:25 +03:00
parent 1a2fe59d88
commit 834516d4a7
4 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Telegram/SourceFiles/calls/calls.style
View file

@ -407,12 +407,12 @@ groupCallWidth: 380px;
groupCallHeight: 580px; groupCallHeight: 580px;
groupCallRipple: RippleAnimation(defaultRippleAnimation) { groupCallRipple: RippleAnimation(defaultRippleAnimation) {
color: groupCallMembersRipple; color: groupCallMembersBgRipple;
} }
groupCallMembersListItem: PeerListItem(defaultPeerListItem) { groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
button: OutlineButton(defaultPeerListButton) { button: OutlineButton(defaultPeerListButton) {
textBg: groupCallMembersBg; textBg: groupCallMembersBg;
textBgOver: groupCallMembersBg; textBgOver: groupCallMembersBgOver;
textFg: groupCallMemberInactiveStatus; textFg: groupCallMemberInactiveStatus;
textFgOver: groupCallMemberInactiveStatus; textFgOver: groupCallMemberInactiveStatus;
@ -459,7 +459,7 @@ groupCallInviteMembersList: PeerList(groupCallMembersList) {
groupCallMultiSelect: MultiSelect(defaultMultiSelect) { groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
bg: groupCallMembersBg; bg: groupCallMembersBg;
item: MultiSelectItem(defaultMultiSelectItem) { item: MultiSelectItem(defaultMultiSelectItem) {
textBg: groupCallMembersRipple; textBg: groupCallMembersBgRipple;
textFg: groupCallMembersFg; textFg: groupCallMembersFg;
textActiveBg: groupCallActiveFg; textActiveBg: groupCallActiveFg;
textActiveFg: groupCallMembersFg; textActiveFg: groupCallMembersFg;
@ -557,10 +557,10 @@ groupCallBox: Box(defaultBox) {
numbersTextFg: groupCallActiveFg; numbersTextFg: groupCallActiveFg;
numbersTextFgOver: groupCallActiveFg; numbersTextFgOver: groupCallActiveFg;
textBg: groupCallMembersBg; textBg: groupCallMembersBg;
textBgOver: groupCallBoxButtonBgOver; textBgOver: groupCallMembersBgOver;
ripple: RippleAnimation(defaultRippleAnimation) { ripple: RippleAnimation(defaultRippleAnimation) {
color: groupCallBoxButtonBgRipple; color: groupCallMembersBgRipple;
} }
} }
margin: margins(0px, 56px, 0px, 10px); margin: margins(0px, 56px, 0px, 10px);
@ -594,15 +594,15 @@ groupCallRadio: Radio(defaultRadio) {
groupCallCheckbox: Checkbox(defaultBoxCheckbox) { groupCallCheckbox: Checkbox(defaultBoxCheckbox) {
textFg: groupCallMembersFg; textFg: groupCallMembersFg;
textFgActive: groupCallMembersFg; textFgActive: groupCallMembersFg;
rippleBg: groupCallMembersRipple; rippleBg: groupCallMembersBgRipple;
rippleBgActive: groupCallBoxButtonBgRipple; rippleBgActive: groupCallMembersBgRipple;
} }
groupCallSettingsButton: SettingsButton { groupCallSettingsButton: SettingsButton {
textFg: groupCallMembersFg; textFg: groupCallMembersFg;
textFgOver: groupCallMembersFg; textFgOver: groupCallMembersFg;
textBg: groupCallMembersBg; textBg: groupCallMembersBg;
textBgOver: groupCallBoxButtonBgOver; textBgOver: groupCallMembersBgOver;
font: boxTextFont; font: boxTextFont;
rightLabel: FlatLabel(defaultSettingsRightLabel) { rightLabel: FlatLabel(defaultSettingsRightLabel) {
@ -613,7 +613,7 @@ groupCallSettingsButton: SettingsButton {
padding: margins(22px, 10px, 22px, 8px); padding: margins(22px, 10px, 22px, 8px);
ripple: RippleAnimation(defaultRippleAnimation) { ripple: RippleAnimation(defaultRippleAnimation) {
color: groupCallBoxButtonBgRipple; color: groupCallMembersBgRipple;
} }
} }
groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) { groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) {

6
Telegram/SourceFiles/calls/calls_group_members.cpp
View file

@ -646,7 +646,11 @@ GroupMembers::GroupMembers(
paintRequest( paintRequest(
) | rpl::start_with_next([=](QRect clip) { ) | 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()); }, lifetime());
} }

8
Telegram/SourceFiles/calls/calls_group_settings.cpp
View file

@ -85,7 +85,11 @@ void GroupCallSettingsBox(
const auto joinMuted = goodReal ? real->joinMuted() : false; const auto joinMuted = goodReal ? real->joinMuted() : false;
const auto canChangeJoinMuted = (goodReal && real->canChangeJoinMuted()); 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<Ui::Checkbox>( ? box->addRow(object_ptr<Ui::Checkbox>(
box.get(), box.get(),
tr::lng_group_call_new_muted(), tr::lng_group_call_new_muted(),
@ -93,7 +97,7 @@ void GroupCallSettingsBox(
st::groupCallCheckbox, st::groupCallCheckbox,
st::groupCallCheck)) st::groupCallCheck))
: nullptr; : nullptr;
if (muteJoined) { if (addCheck) {
AddSkip(layout); AddSkip(layout);
} }

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 7287e235e0205fd878cd35329d08aa1aa1c218fa Subproject commit 79ea651127962fff366e9d76ce4d932490b30158