Improve group call popup menu styles.

This commit is contained in:
John Preston 2020-11-30 15:11:24 +03:00
parent aeea262b92
commit 5739b70844
3 changed files with 19 additions and 9 deletions

View file

@ -411,8 +411,8 @@ groupCallRipple: RippleAnimation(defaultRippleAnimation) {
} }
groupCallMenu: Menu(defaultMenu) { groupCallMenu: Menu(defaultMenu) {
itemBg: groupCallMembersBgOver; itemBg: groupCallMenuBg;
itemBgOver: groupCallMembersBgRipple; itemBgOver: groupCallMenuBgOver;
itemFg: groupCallMembersFg; itemFg: groupCallMembersFg;
itemFgOver: groupCallMembersFg; itemFgOver: groupCallMembersFg;
itemFgDisabled: groupCallMemberNotJoinedStatus; itemFgDisabled: groupCallMemberNotJoinedStatus;
@ -424,13 +424,15 @@ groupCallMenu: Menu(defaultMenu) {
arrow: icon {{ "dropdown_submenu_arrow", groupCallMemberNotJoinedStatus }}; arrow: icon {{ "dropdown_submenu_arrow", groupCallMemberNotJoinedStatus }};
ripple: groupCallRipple; ripple: RippleAnimation(defaultRippleAnimation) {
color: groupCallMenuBgRipple;
}
} }
groupCallMenuShadow: Shadow(defaultEmptyShadow) { groupCallMenuShadow: Shadow(defaultEmptyShadow) {
fallback: groupCallMembersBgOver; fallback: groupCallMenuBg;
} }
groupCallPanelAnimation: PanelAnimation(defaultPanelAnimation) { groupCallPanelAnimation: PanelAnimation(defaultPanelAnimation) {
fadeBg: groupCallMembersBgOver; fadeBg: groupCallMenuBg;
shadow: groupCallMenuShadow; shadow: groupCallMenuShadow;
} }
groupCallPopupMenu: PopupMenu(defaultPopupMenu) { groupCallPopupMenu: PopupMenu(defaultPopupMenu) {
@ -565,8 +567,16 @@ groupCallSettings: CallButton(callMicrophoneMute) {
color: callMuteRipple; color: callMuteRipple;
} }
} }
bg: callIconBg; }
outerBg: callMuteRipple; groupCallHangup: CallButton(callHangup) {
button: IconButton(callButton) {
icon: icon {{ "calls/call_discard", callIconFg }};
ripple: RippleAnimation(defaultRippleAnimation) {
color: groupCallLeaveBgRipple;
}
}
bg: groupCallLeaveBg;
outerBg: groupCallLeaveBg;
label: callButtonLabel; label: callButtonLabel;
} }
groupCallButtonSkip: 43px; groupCallButtonSkip: 43px;

View file

@ -226,7 +226,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
.text = tr::lng_group_call_connecting(tr::now), .text = tr::lng_group_call_connecting(tr::now),
.type = Ui::CallMuteButtonType::Connecting, .type = Ui::CallMuteButtonType::Connecting,
})) }))
, _hangup(widget(), st::callHangup) { , _hangup(widget(), st::groupCallHangup) {
_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox); _layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
initWindow(); initWindow();

@ -1 +1 @@
Subproject commit e0fb1129d145054410476bd83d1cecf5c2a2644d Subproject commit 5897e357bfd6114ecede2711831b8c5e9d045fcb